Mac generator and building 64 bit enabled C code

140 files changed, 26509 insertions, 59931 deletions

diff --git a/bundles/org.eclipse.swt.tools/.classpath b/bundles/org.eclipse.swt.tools/.classpath
index 140a6bcf0f..a23e6d08aa 100644
--- a/bundles/org.eclipse.swt.tools/.classpath
+++ b/bundles/org.eclipse.swt.tools/.classpath
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="JNI Generation"/>
+	<classpathentry kind="src" path="Mac Generation"/>
 	<classpathentry kind="src" path="Sleak"/>
-	<classpathentry kind="src" path="NativeStats"/>
 	<classpathentry kind="src" path="Mozilla Generation"/>
+	<classpathentry kind="src" path="NativeStats"/>
 	<classpathentry kind="src" path="Icon Exe"/>
-	<classpathentry kind="src" path="Mac Generation"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.swt.tools/.project b/bundles/org.eclipse.swt.tools/.project
index 8dd524dd69..d03eade59c 100644
--- a/bundles/org.eclipse.swt.tools/.project
+++ b/bundles/org.eclipse.swt.tools/.project
@@ -12,8 +12,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTClass.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTClass.java
new file mode 100644
index 0000000000..72dadac99e
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTClass.java
@@ -0,0 +1,188 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tools.internal;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.ASTParser;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.FieldDeclaration;
+import org.eclipse.jdt.core.dom.ImportDeclaration;
+import org.eclipse.jdt.core.dom.Javadoc;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
+import org.eclipse.jdt.core.dom.TagElement;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
+import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
+import org.eclipse.swt.tools.internal.ASTType.TypeResolver;
+
+public class ASTClass extends ASTItem implements JNIClass {
+	String sourcePath;
+	MetaData metaData;
+
+	ASTClass superclass;
+	ASTField[] fields;
+	ASTMethod[] methods;
+	String name, simpleName, superclassName, packageName;
+	String[] imports;
+	String data;
+	
+	TypeResolver resolver = new TypeResolver() {
+		public String findPath(String simpleName) {
+			if (simpleName.equals(ASTClass.this.simpleName)) return sourcePath;
+			String basePath = sourcePath.substring(0, sourcePath.length() - name.length() - ".java".length());
+			File file = new File(basePath + packageName.replace('.', '/') + "/" + simpleName + ".java");
+			if (file.exists()) {
+				return file.getAbsolutePath();
+			}
+			for (int i = 0; i < imports.length; i++) {
+				file = new File(basePath + imports[i].replace('.', '/') + "/" + simpleName + ".java");
+				if (file.exists()) {
+					return file.getAbsolutePath();				
+				}
+			}
+			return "";
+		}
+		public String resolve(String simpleName) {
+			if (simpleName.equals(ASTClass.this.simpleName)) return packageName + "." + simpleName;
+			String basePath = sourcePath.substring(0, sourcePath.length() - name.length() - ".java".length());
+			File file = new File(basePath + packageName.replace('.', '/') + "/" + simpleName + ".java");
+			if (file.exists()) {
+				return packageName + "." + simpleName;				
+			}
+			for (int i = 0; i < imports.length; i++) {
+				file = new File(basePath + imports[i].replace('.', '/') + "/" + simpleName + ".java");
+				if (file.exists()) {
+					return imports[i] + "." + simpleName;				
+				}
+			}
+			return simpleName;
+		}
+	};
+
+public ASTClass(String sourcePath, MetaData metaData) {
+	this.sourcePath = sourcePath;
+	this.metaData = metaData;
+	
+	String source = JNIGenerator.loadFile(sourcePath);
+	ASTParser parser = ASTParser.newParser(AST.JLS3);
+	parser.setSource(source.toCharArray());
+	CompilationUnit unit = (CompilationUnit)parser.createAST(null);
+	TypeDeclaration type = (TypeDeclaration)unit.types().get(0);
+	simpleName = type.getName().getIdentifier();
+	packageName = unit.getPackage().getName().getFullyQualifiedName();
+	name = packageName + "." + simpleName;
+	superclassName = type.getSuperclassType() != null ? type.getSuperclassType().toString() : null;
+	List imports = unit.imports();
+	this.imports = new String[imports.size()];
+	int count = 0;
+	for (Iterator iterator = imports.iterator(); iterator.hasNext();) {
+		ImportDeclaration imp = (ImportDeclaration) iterator.next();
+		this.imports[count++] = imp.getName().getFullyQualifiedName();
+	}
+	
+	Javadoc doc = type.getJavadoc();
+	List tags = null;
+	if (doc != null) {
+		tags = doc.tags();
+		for (Iterator iterator = tags.iterator(); iterator.hasNext();) {
+			TagElement tag = (TagElement) iterator.next();
+			if ("@jniclass".equals(tag.getTagName())) {
+				String data = tag.fragments().get(0).toString();
+				setMetaData(data);
+				break;
+			}
+		}
+	}
+
+	FieldDeclaration[] fields = type.getFields();
+	ArrayList fid = new ArrayList();
+	for (int i = 0; i < fields.length; i++) {
+		FieldDeclaration field = fields[i];
+		List fragments = field.fragments();
+		for (Iterator iterator = fragments.iterator(); iterator.hasNext();) {
+			VariableDeclarationFragment fragment = (VariableDeclarationFragment) iterator.next();
+			fid.add(new ASTField(this, source, field, fragment));
+		}
+	}
+	this.fields = (ASTField[])fid.toArray(new ASTField[fid.size()]);
+	MethodDeclaration[] methods = type.getMethods();
+	ArrayList mid = new ArrayList();
+	for (int i = 0; i < methods.length; i++) {
+		if (methods[i].getReturnType2() == null) continue;
+		mid.add(new ASTMethod(this, source, methods[i]));
+	}
+	this.methods = (ASTMethod[])mid.toArray(new ASTMethod[mid.size()]);
+}
+
+public int hashCode() {
+	return getName().hashCode();
+}
+
+public boolean equals(Object obj) {
+	if (this == obj) return true;
+	if (!(obj instanceof ASTClass)) return false;
+	return ((ASTClass)obj).getName().equals(getName());
+}
+
+public JNIField[] getDeclaredFields() {
+	JNIField[] result = new JNIField[fields.length];
+	System.arraycopy(fields, 0, result, 0, result.length);
+	return result;
+}
+
+public JNIMethod[] getDeclaredMethods() {
+	JNIMethod[] result = new JNIMethod[methods.length];
+	System.arraycopy(methods, 0, result, 0, result.length);
+	return result;
+}
+
+public String getName() {
+	return name;
+}
+
+public JNIClass getSuperclass() {
+	if (superclassName == null) return new ReflectClass(Object.class);
+	if (superclass != null) return superclass;
+	String sourcePath = resolver.findPath(superclassName);
+	return superclass = new ASTClass(sourcePath, metaData);
+}
+
+public String getSimpleName() {
+	return simpleName;
+}
+
+public String getExclude() {
+	return (String)getParam("exclude");
+}
+
+public String getMetaData() {
+	if (data != null) return data;
+	String key = JNIGenerator.toC(getName());
+	return metaData.getMetaData(key, "");
+}
+
+public void setExclude(String str) { 
+	setParam("exclude", str);
+}
+
+public void setMetaData(String value) {
+	data = value;
+}
+
+public String toString() {
+	return getName();
+}
+
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTField.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTField.java
new file mode 100644
index 0000000000..622eb757a9
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTField.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tools.internal;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.jdt.core.dom.FieldDeclaration;
+import org.eclipse.jdt.core.dom.Javadoc;
+import org.eclipse.jdt.core.dom.TagElement;
+import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
+
+public class ASTField extends ASTItem implements JNIField {
+	ASTClass declaringClass;
+	String name;
+	int modifiers;
+	ASTType type, type64;
+	String data;
+	
+public ASTField(ASTClass declaringClass, String source, FieldDeclaration field, VariableDeclarationFragment fragment) {
+	this.declaringClass = declaringClass;	
+	name = fragment.getName().getIdentifier();
+	modifiers = field.getModifiers();
+	
+	Javadoc doc = field.getJavadoc();
+	List tags = null;
+	if (doc != null) {
+		tags = doc.tags();
+		for (Iterator iterator = tags.iterator(); iterator.hasNext();) {
+			TagElement tag = (TagElement) iterator.next();
+			if ("@field".equals(tag.getTagName())) {
+				String data = tag.fragments().get(0).toString();
+				setMetaData(data);
+				break;
+			}
+		}
+	}
+	type = new ASTType(declaringClass.resolver, field.getType(), fragment.getExtraDimensions());
+	type64 =  this.type;
+	if (GEN64) {
+		String s = source.substring(field.getStartPosition(), field.getStartPosition() + field.getLength());
+		if (type.isType("int") && s.indexOf("int /*long*/") != -1) type64 = new ASTType("J");
+		else if (type.isType("float") && s.indexOf("float /*double*/") != -1) type64 = new ASTType("D");
+		else if (type.isType("[I") && (s.indexOf("int /*long*/") != -1 || s.indexOf("int[] /*long[]*/") != -1)) type64 = new ASTType("[J");
+		else if (type.isType("[F") && (s.indexOf("float /*double*/") != -1|| s.indexOf("float[] /*double[]*/") != -1)) type64 = new ASTType("[D");
+		else if (type.isType("long") && s.indexOf("long /*int*/") != -1) type = new ASTType("I");
+		else if (type.isType("double") && s.indexOf("double /*float*/") != -1) type = new ASTType("F");
+		else if (type.isType("[J") && (s.indexOf("long /*int*/") != -1|| s.indexOf("long[] /*int[]*/") != -1)) type = new ASTType("[I");
+		else if (type.isType("[D") && (s.indexOf("double /*float*/") != -1|| s.indexOf("double[] /*float[]*/") != -1)) type = new ASTType("[F");
+	}
+}
+
+public int hashCode() {
+	return getName().hashCode();
+}
+
+public boolean equals(Object obj) {
+	if (this == obj) return true;
+	if (!(obj instanceof ASTField)) return false;
+	return ((ASTField)obj).getName().equals(getName());
+}
+
+public JNIClass getDeclaringClass() {
+	return declaringClass;
+}
+
+public int getModifiers() {
+	return modifiers;
+}
+
+public String getName() {
+	return name;
+}
+
+public JNIType getType() {
+	return type;
+}
+
+public JNIType getType64() {
+	return type64;
+}
+
+public String getAccessor() {
+	return (String)getParam("accessor");
+}
+
+public String getCast() {
+	String cast = ((String)getParam("cast")).trim();
+	if (cast.length() > 0) {
+		if (!cast.startsWith("(")) cast = "(" + cast;
+		if (!cast.endsWith(")")) cast = cast + ")";
+	}
+	return cast;
+}
+
+public String getExclude() {
+	return (String)getParam("exclude");
+}
+
+public String getMetaData() {
+	if (data != null) return data;
+	String className = getDeclaringClass().getSimpleName();
+	String key = className + "_" + getName();
+	return declaringClass.metaData.getMetaData(key, "");
+}
+
+public void setAccessor(String str) { 
+	setParam("accessor", str);
+}
+
+public void setCast(String str) {
+	setParam("cast", str);
+}
+
+public void setExclude(String str) { 
+	setParam("exclude", str);
+}
+
+public void setMetaData(String value) {
+	data = value;
+}
+
+public String toString() {
+	return getName();
+}
+
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTItem.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTItem.java
new file mode 100644
index 0000000000..51965b92f1
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTItem.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tools.internal;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Set;
+
+public abstract class ASTItem extends AbstractItem {
+
+public String flatten() {
+	checkParams();
+	StringBuffer buffer = new StringBuffer();
+	Set set = params.keySet();
+	String[] keys = (String[])set.toArray(new String[set.size()]);
+	Arrays.sort(keys);
+	for (int j = 0; j < keys.length; j++) {
+		String key = keys[j];
+		Object value = params.get(key);
+		String valueStr = "";
+		if (value instanceof String) {
+			valueStr = (String)value;
+		} else if (value instanceof String[]) {
+			String[] values = (String[])value;
+			StringBuffer valueBuffer = new StringBuffer();
+			for (int i = 0; i < values.length; i++) {
+				if (i != 0) valueBuffer.append(" ");
+				valueBuffer.append(values[i]);
+			}
+			valueStr = valueBuffer.toString();
+		} else {
+			valueStr = value.toString();
+		}
+		if (valueStr.length() > 0) {
+			if (buffer.length() != 0) buffer.append(",");
+			buffer.append(key);
+			buffer.append("=");
+			buffer.append(valueStr);
+		}
+	}
+	return buffer.toString();
+}
+
+public void parse(String str) {
+	this.params = new HashMap();
+	if (str.length() == 0) return;
+	String[] params = split(str, ",");
+	for (int i = 0; i < params.length; i++) {
+		String param = params[i];
+		int equals = param.indexOf('=');
+		if (equals ==  -1) {
+			System.out.println("Error: " + str + " param " + param);
+		}
+		String key = param.substring(0, equals).trim();
+		String value = param.substring(equals + 1).trim();
+		setParam(key, value);
+	}
+}
+
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTMethod.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTMethod.java
new file mode 100644
index 0000000000..3c22defa58
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTMethod.java
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tools.internal;
+
+import java.lang.reflect.Modifier;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.jdt.core.dom.Javadoc;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
+import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
+import org.eclipse.jdt.core.dom.TagElement;
+
+public class ASTMethod extends ASTItem implements JNIMethod {
+	String name, qualifiedName;
+	int modifiers;
+	ASTClass declaringClass;
+	ASTType[] paramTypes, paramTypes64;
+	ASTType returnType, returnType64;
+	ASTParameter[] params;
+	Boolean unique;
+	String data;
+	
+public ASTMethod(ASTClass declaringClass, String source, MethodDeclaration method) {
+	this.declaringClass = declaringClass;
+	
+	name = method.getName().getIdentifier();
+	modifiers = method.getModifiers();
+	
+	Javadoc doc = method.getJavadoc();
+	List tags = null;
+	if (doc != null) {
+		tags = doc.tags();
+		for (Iterator iterator = tags.iterator(); iterator.hasNext();) {
+			TagElement tag = (TagElement) iterator.next();
+			if ("@method".equals(tag.getTagName())) {
+				String data = tag.fragments().get(0).toString();
+				setMetaData(data);
+				break;
+			}
+		}
+	}
+	returnType = new ASTType(declaringClass.resolver, method.getReturnType2(), method.getExtraDimensions());
+	returnType64 = returnType;
+	if (GEN64) {
+		String s = source.substring(method.getReturnType2().getStartPosition(), method.getName().getStartPosition());
+		if (returnType.isType("int") && s.indexOf("int /*long*/") != -1) returnType64 = new ASTType("J");
+		else if (returnType.isType("float") && s.indexOf("float /*double*/") != -1) returnType64 = new ASTType("D");
+		else if (returnType.isType("[I") && (s.indexOf("int /*long*/") != -1 || s.indexOf("int[] /*long[]*/") != -1)) returnType64 = new ASTType("[J");
+		else if (returnType.isType("[F") && (s.indexOf("float /*double*/") != -1|| s.indexOf("float[] /*double[]*/") != -1)) returnType64 = new ASTType("[D");
+		else if (returnType.isType("long") && s.indexOf("long /*int*/") != -1) returnType = new ASTType("I");
+		else if (returnType.isType("double") && s.indexOf("double /*float*/") != -1) returnType = new ASTType("F");
+		else if (returnType.isType("[J") && (s.indexOf("long /*int*/") != -1|| s.indexOf("long[] /*int[]*/") != -1)) returnType = new ASTType("[I");
+		else if (returnType.isType("[D") && (s.indexOf("double /*float*/") != -1|| s.indexOf("double[] /*float[]*/") != -1)) returnType = new ASTType("[F");
+	}
+	
+	List parameters = method.parameters();
+	paramTypes = new ASTType[parameters.size()];
+	paramTypes64 = new ASTType[parameters.size()];
+	params = new ASTParameter[paramTypes.length];
+	int i = 0;
+	for (Iterator iterator = parameters.iterator(); iterator.hasNext(); i++) {
+		SingleVariableDeclaration param = (SingleVariableDeclaration) iterator.next();
+		paramTypes[i] = new ASTType(declaringClass.resolver, param.getType(), param.getExtraDimensions());
+		paramTypes64[i] = paramTypes[i];
+		params[i] = new ASTParameter(this, i);
+		if (GEN64) {
+			String s = source.substring(param.getStartPosition(), param.getStartPosition() + param.getLength());
+			if (paramTypes[i].isType("int") && s.indexOf("int /*long*/") != -1) paramTypes64[i] = new ASTType("J");
+			else if (paramTypes[i].isType("float") && s.indexOf("float /*double*/") != -1) paramTypes64[i] = new ASTType("D");
+			else if (paramTypes[i].isType("[I") && (s.indexOf("int /*long*/") != -1 || s.indexOf("int[] /*long[]*/") != -1)) paramTypes64[i] = new ASTType("[J");
+			else if (paramTypes[i].isType("[F") && (s.indexOf("float /*double*/") != -1|| s.indexOf("float[] /*double[]*/") != -1)) paramTypes64[i] = new ASTType("[D");
+			else if (paramTypes[i].isType("long") && s.indexOf("long /*int*/") != -1) paramTypes[i] = new ASTType("I");
+			else if (paramTypes[i].isType("double") && s.indexOf("double /*float*/") != -1) paramTypes[i] = new ASTType("F");
+			else if (paramTypes[i].isType("[J") && (s.indexOf("long /*int*/") != -1|| s.indexOf("long[] /*int[]*/") != -1)) paramTypes[i] = new ASTType("[I");
+			else if (paramTypes[i].isType("[D") && (s.indexOf("double /*float*/") != -1|| s.indexOf("double[] /*float[]*/") != -1)) paramTypes[i] = new ASTType("[F");
+		}
+		if (tags != null) {
+			String name = param.getName().getIdentifier();
+			for (Iterator iterator1 = tags.iterator(); iterator1.hasNext();) {
+				TagElement tag = (TagElement) iterator1.next();
+				if ("@param".equals(tag.getTagName())) {
+					List fragments = tag.fragments();
+					if (name.equals(fragments.get(0).toString())) {
+						String data = fragments.get(1).toString();
+						params[i].setMetaData(data);
+					}
+				}
+			}
+		}
+	}
+}
+
+public JNIClass getDeclaringClass() {
+	return declaringClass;
+}
+
+public int getModifiers() {
+	return modifiers;
+}
+
+public String getName() {
+	return name;
+}
+
+public boolean isNativeUnique() {
+	if (unique != null) return unique.booleanValue();
+	boolean result = true;
+	String name = getName();
+	JNIMethod[] methods = declaringClass.getDeclaredMethods();
+	for (int i = 0; i < methods.length; i++) {
+		JNIMethod mth = methods[i];
+		if ((mth.getModifiers() & Modifier.NATIVE) != 0 &&
+			this != mth && !this.equals(mth) &&
+			name.equals(mth.getName()))
+			{
+				result = false;
+				break;
+			}
+	}
+	unique = new Boolean(result);
+	return result;
+}
+
+public JNIType[] getParameterTypes() {
+	return paramTypes;
+}
+
+public JNIType[] getParameterTypes64() {
+	return paramTypes64;
+}
+
+public JNIParameter[] getParameters() {
+	return params;
+}
+
+public JNIType getReturnType() {
+	return returnType;
+}
+
+public JNIType getReturnType64() {
+	return returnType64;
+}
+
+public String getAccessor() {
+	return (String)getParam("accessor");
+}
+
+public String getExclude() {
+	return (String)getParam("exclude");
+}
+
+public String getMetaData() {
+	if (data != null) return data;
+	String className = getDeclaringClass().getSimpleName();
+	String key = className + "_" + JNIGenerator.getFunctionName(this);
+	MetaData metaData = declaringClass.metaData;
+	String value = metaData.getMetaData(key, null);
+	if (value == null) {
+		key = className + "_" + getName();
+		value = metaData.getMetaData(key, null);
+	}
+	/*
+	* Support for lock.
+	*/
+	if (value == null && getName().startsWith("_")) {
+		key = className + "_" + JNIGenerator.getFunctionName(this).substring(2);
+		value = metaData.getMetaData(key, null);
+		if (value == null) {
+			key = className + "_" + getName().substring(1);
+			value = metaData.getMetaData(key, null);
+		}
+	}
+	if (value == null) value = "";	
+	return value;
+}
+
+public void setAccessor(String str) { 
+	setParam("accessor", str);
+}
+
+public void setExclude(String str) { 
+	setParam("exclude", str);
+}
+
+public void setMetaData(String value) {
+	data = value;
+}
+
+public String toString() {
+	return getName();
+}
+
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTParameter.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTParameter.java
new file mode 100644
index 0000000000..a520fdd81a
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTParameter.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tools.internal;
+
+public class ASTParameter extends ASTItem implements JNIParameter {
+	ASTMethod method;
+	int parameter;
+	String data;
+
+public ASTParameter(ASTMethod method, int parameter) {
+	this.method = method;
+	this.parameter = parameter;
+}
+
+public String getCast() {
+	String cast = ((String)getParam("cast")).trim();
+	if (cast.length() > 0) {
+		if (!cast.startsWith("(")) cast = "(" + cast;
+		if (!cast.endsWith(")")) cast = cast + ")";
+	}
+	return cast;
+}
+
+public String getMetaData() {
+	if (data != null) return data;
+	String className = method.getDeclaringClass().getSimpleName();
+	String key = className + "_" + JNIGenerator.getFunctionName(method) + "_" + parameter;
+	MetaData metaData = method.declaringClass.metaData;
+	String value = metaData.getMetaData(key, null);
+	if (value == null) {
+		key = className + "_" + method.getName() + "_" + parameter;
+		value = metaData.getMetaData(key, null);
+	}
+	/*
+	* Support for lock.
+	*/
+	if (value == null && method.getName().startsWith("_")) {
+		key = className + "_" + JNIGenerator.getFunctionName(method).substring(2) + "_" + parameter;
+		value = metaData.getMetaData(key, null);
+		if (value == null) {
+			key = className + "_" + method.getName().substring(1) + "_" + parameter;
+			value = metaData.getMetaData(key, null);
+		}
+	}
+	if (value == null) value = "";	
+	return value;
+}
+
+public JNIMethod getMethod() {
+	return method;
+}
+
+public JNIClass getTypeClass() {
+	ASTType type = (ASTType)getType();
+	ASTClass declaringClass = method.declaringClass;
+	String sourcePath = declaringClass.resolver.findPath(type.getSimpleName());
+	return new ASTClass(sourcePath, declaringClass.metaData);
+}
+
+public JNIType getType() {
+	return method.getParameterTypes()[parameter];
+}
+
+public JNIType getType64() {
+	return method.getParameterTypes64()[parameter];
+}
+
+public int getParameter() {
+	return parameter;
+}
+
+public void setCast(String str) {
+	setParam("cast", str);
+}
+
+public void setMetaData(String value) {
+	data = value;
+}
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTType.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTType.java
new file mode 100644
index 0000000000..a98ac50d91
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ASTType.java
@@ -0,0 +1,214 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tools.internal;
+
+import org.eclipse.jdt.core.dom.ArrayType;
+import org.eclipse.jdt.core.dom.Type;
+
+public class ASTType implements JNIType {
+	
+	static interface TypeResolver {
+		public String findPath(String simpleName);
+		public String resolve(String simpleName);
+	}	
+	
+	String name;
+
+public ASTType(String name) {
+	this.name = name;
+}
+
+public ASTType(TypeResolver resolver, Type type, int extraDimensions) {
+	name = from(resolver, type, extraDimensions);
+}
+
+String from(TypeResolver resolver, Type type, int extraDimensions) {
+	String name = "";
+	String str = type.toString();
+	if (type.isPrimitiveType()) {
+		if (str.equals("void")) name = "V";
+		else if (str.equals("int")) name = "I";
+		else if (str.equals("boolean")) name = "Z";
+		else if (str.equals("long")) name = "J";
+		else if (str.equals("short")) name = "S";
+		else if (str.equals("char")) name = "C";
+		else if (str.equals("byte")) name = "B";
+		else if (str.equals("float")) name = "F";
+		else if (str.equals("double")) name = "D";
+	} else if (type.isArrayType()) {
+		ArrayType arrayType = (ArrayType)type;
+		name = from(resolver, arrayType.getElementType(), arrayType.getDimensions());
+	} else if (str.indexOf('.') != -1) {
+		name = "L" + type.toString().replace('.', '/') + ";";
+	} else if (str.equals("String")){
+		name = "Ljava/lang/String;";
+	} else if (str.equals("Class")){
+		name = "Ljava/lang/Class;";
+	} else if (str.equals("Object")){
+		name = "Ljava/lang/Object;";
+	} else {
+		String qualifiedName = resolver != null  ? resolver.resolve(str) : str;
+		name = "L" + qualifiedName.replace('.', '/') + ";";
+	}
+	for (int i = 0; i < extraDimensions; i++) {
+		name = "[" + name;
+	}
+	return name;
+}
+
+public boolean equals(Object obj) {
+	if (obj == this) return true;
+	if (!(obj instanceof ASTType)) return false;
+	return ((ASTType)obj).name.equals(name);
+}
+
+public JNIType getComponentType() {
+	if (!name.startsWith("[")) throw new RuntimeException();
+	return new ASTType(name.substring(1));
+}
+
+public String getName() {
+	if (isPrimitive()) {
+		if (name.equals("V")) return "void";
+		if (name.equals("I")) return "int";
+		if (name.equals("Z")) return "boolean";
+		if (name.equals("J")) return "long";
+		if (name.equals("S")) return "short";
+		if (name.equals("C")) return "char";
+		if (name.equals("B")) return "byte";
+		if (name.equals("F")) return "float";
+		if (name.equals("D")) return "double";
+	}
+	if (isArray()) return name;
+	return name.substring(1, name.length() - 1).replace('/', '.');
+}
+
+public String getSimpleName() {
+	String name = getName();
+	if (isArray() || isPrimitive()) return name;
+	int index = name.lastIndexOf('.') + 1;
+	return name.substring(index, name.length());
+}
+
+public String getTypeSignature(boolean define) {
+	if (isPrimitive()) {
+		if (define) {
+			if (name.equals("I")) return "I_J";
+			if (name.equals("J")) return "I_J";
+			if (name.equals("F")) return "F_D";
+			if (name.equals("D")) return "F_D";
+		}
+		return name;
+	}
+	if (isArray()) {
+		if (define) return getComponentType().getTypeSignature(define) + "Array";
+		return "[" + getComponentType().getTypeSignature(define);
+	}
+	return name;
+}
+
+public String getTypeSignature1(boolean define) {
+	if (isPrimitive()) {
+		if (name.equals("V")) return "Void";
+		if (name.equals("I")) return define ? "IntLong" : "Int";
+		if (name.equals("Z")) return "Boolean";
+		if (name.equals("J")) return define ? "IntLong" : "Long";
+		if (name.equals("S")) return "Short";
+		if (name.equals("C")) return "Char";
+		if (name.equals("B")) return "Byte";
+		if (name.equals("F")) return define ? "FloatDouble" : "Float";
+		if (name.equals("D")) return define ? "FloatDouble" : "Double";
+	}
+	if (name.equals("Ljava/lang/String;")) return "String";
+	return "Object";
+}
+
+public String getTypeSignature2(boolean define) {
+	if (isPrimitive()) {
+		if (name.equals("V")) return "void";
+		if (name.equals("I")) return define ? "jintLong" : "jint";
+		if (name.equals("Z")) return "jboolean";
+		if (name.equals("J")) return define ? "jintLong" : "jlong";
+		if (name.equals("S")) return "jshort";
+		if (name.equals("C")) return "jchar";
+		if (name.equals("B")) return "jbyte";
+		if (name.equals("F")) return define ? "jfloatDouble" : "jfloat";
+		if (name.equals("D")) return define ? "jfloatDouble" : "jdouble";
+	}
+	if (name.equals("Ljava/lang/String;")) return "jstring";
+	if (name.equals("Ljava/lang/Class;")) return "jclass";
+	if (isArray()) {
+		return getComponentType().getTypeSignature2(define) + "Array";
+	}
+	return "jobject";
+}
+
+public String getTypeSignature3(boolean define) {
+	if (isPrimitive()) {
+		if (name.equals("V")) return "void";
+		if (name.equals("I")) return "int";
+		if (name.equals("Z")) return "boolean";
+		if (name.equals("J")) return "long";
+		if (name.equals("S")) return "short";
+		if (name.equals("C")) return "char";
+		if (name.equals("B")) return "byte";
+		if (name.equals("F")) return "float";
+		if (name.equals("D")) return "double";
+	}
+	if (name.equals("Ljava/lang/String;")) return "String";
+	if (isArray()) {
+		return getComponentType().getTypeSignature3(define) + "[]";
+	}
+	return getName();
+}
+
+public String getTypeSignature4(boolean define, boolean struct) {
+	if (isPrimitive()) {
+		if (name.equals("V")) return "void";
+		if (name.equals("I")) return define ? "jintLong" : "jint";
+		if (name.equals("Z")) return "jboolean";
+		if (name.equals("J")) return define ? "jintLong" : "jlong";
+		if (name.equals("S")) return "jshort";
+		if (name.equals("C")) return "jchar";
+		if (name.equals("B")) return "jbyte";
+		if (name.equals("F")) return define ? "jfloatDouble" : "jfloat";
+		if (name.equals("D")) return define ? "jfloatDouble" : "jdouble";
+	}
+	if (name.equals("Ljava/lang/String;")) return "jstring";
+	if (isArray()) {
+		String sig = getComponentType().getTypeSignature4(define, struct);
+		return struct ? sig : sig + " *";
+	}
+	String sig = getSimpleName(); 
+	return struct ? sig : sig + " *";
+}
+
+public int hashCode() {
+	return name.hashCode();
+}
+
+public boolean isArray() {
+	return name.startsWith("[");
+}
+
+public boolean isPrimitive() {
+	return !name.startsWith("L") && !name.startsWith("[");
+}
+
+public boolean isType(String type) {
+	return getName().equals(type);
+}
+
+public String toString() {
+	return name;
+}
+
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/AbstractItem.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/AbstractItem.java
new file mode 100644
index 0000000000..883c854471
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/AbstractItem.java
@@ -0,0 +1,80 @@
+package org.eclipse.swt.tools.internal;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+
+public abstract class AbstractItem implements JNIItem {
+
+	HashMap params;
+
+static String[] split(String str, String separator) {
+	return JNIGenerator.split(str, separator);
+}
+
+void checkParams() {
+	if (params != null) return;
+	parse(getMetaData());
+}
+
+public abstract String flatten();
+
+public String[] getFlags() {
+	Object flags = getParam("flags");
+	if (flags == null) return new String[0];
+	if (flags instanceof String[]) return (String[])flags;
+	String[] result = split((String)flags, " ");
+	setParam("flags", result);
+	return result;
+}
+
+public boolean getFlag(String flag) {
+	String[] flags = getFlags();
+	for (int i = 0; i < flags.length; i++) {
+		if (flags[i].equals(flag)) return true;
+	}
+	return false;
+}
+
+public abstract String getMetaData();
+
+public Object getParam(String key) {
+	checkParams();
+	Object value = params.get(key);
+	return value == null ? "" : value;
+}
+
+public boolean getGenerate() {
+	return !getFlag(FLAG_NO_GEN);
+}
+
+public void setFlags(String[] flags) { 
+	setParam("flags", flags);
+}
+
+public abstract void parse(String str);
+
+public void setFlag(String flag, boolean value) {
+	String[] flags = getFlags();
+	HashSet set = new HashSet(Arrays.asList(flags));
+	if (value) {
+		set.add(flag);
+	} else {
+		set.remove(flag);
+	}
+	setFlags((String[])set.toArray(new String[set.size()]));
+}
+
+public void setGenerate(boolean value) {
+	setFlag(FLAG_NO_GEN, !value);
+}
+
+public abstract void setMetaData(String value);
+
+public void setParam(String key, Object value) {
+	checkParams();
+	params.put(key, value);
+	setMetaData(flatten());
+}
+	
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/CleanupClass.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/CleanupClass.java
index e422083042..ee81cd249c 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/CleanupClass.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/CleanupClass.java
@@ -11,7 +11,6 @@
 package org.eclipse.swt.tools.internal;
 
 import java.io.*;
-import java.lang.reflect.Method;
 import java.util.*;
 
 public abstract class CleanupClass extends JNIGenerator {
@@ -22,8 +21,8 @@ String classSource;
 Hashtable files;
 int usedCount, unusedCount;
 
-String[] getArgNames(Method method) {
-	int n_args = method.getParameterTypes().length;
+String[] getArgNames(JNIMethod method) {
+	int n_args = method.getParameters().length;
 	if (n_args == 0) return new String[0];
 	String name = method.getName();
 	String params = "";
@@ -111,7 +110,7 @@ void loadDirectory(File file) {
 	}
 }
 
-public void generate(Class clazz) {
+public void generate(JNIClass clazz) {
 	loadFiles ();
 	loadClassSource();
 }
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/CleanupConstants.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/CleanupConstants.java
index 9bce94e7fe..1f0ade3d31 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/CleanupConstants.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/CleanupConstants.java
@@ -10,12 +10,12 @@
  *******************************************************************************/
 package org.eclipse.swt.tools.internal;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Modifier;
 import java.util.*;
 
 public class CleanupConstants extends CleanupClass {
 
-String getFieldValue(Field field) {
+String getFieldValue(JNIField field) {
 	String name = field.getName();
 	int index = 0;
 	while (true) {
@@ -29,24 +29,24 @@ String getFieldValue(Field field) {
 	}
 }
 
-public void generate(Class clazz) {
+public void generate(JNIClass clazz) {
 	unusedCount = usedCount = 0;
 	super.generate(clazz);
-	Field[] fields = clazz.getDeclaredFields();
+	JNIField[] fields = clazz.getDeclaredFields();
 	generate(fields);
 	output("used=" + usedCount + " unused=" + unusedCount + " total=" + (unusedCount + usedCount));
 }
 
-public void generate(Field[] fields) {
+public void generate(JNIField[] fields) {
 	sort(fields);
 	for (int i = 0; i < fields.length; i++) {
-		Field field = fields[i];
+		JNIField field = fields[i];
 		if ((field.getModifiers() & Modifier.FINAL) == 0) continue;
 		generate(field);
 	}
 }
 
-public void generate(Field field) {
+public void generate(JNIField field) {
 	String name = field.getName();
 	Enumeration keys = files.keys();
 	while (keys.hasMoreElements()) {
@@ -58,7 +58,7 @@ public void generate(Field field) {
 			output("\t");
 			output(modifiersStr);
 			if (modifiersStr.length() > 0) output(" ");
-			output(getTypeSignature3(field.getType()));
+			output(field.getType().getTypeSignature3(false));
 			output(" " );
 			output(field.getName());
 			output(" = ");
@@ -86,7 +86,7 @@ public static void main(String[] args) {
 		Class clazz = Class.forName(clazzName);
 		gen.setSourcePath(sourcePath);
 		gen.setClassSourcePath(classSource);
-		gen.generate(clazz);
+		gen.generate(new ReflectClass(clazz));
 	} catch (Exception e) {
 		System.out.println("Problem");
 		e.printStackTrace(System.out);
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/CleanupNatives.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/CleanupNatives.java
index 13c4667eef..a0c4e9d484 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/CleanupNatives.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/CleanupNatives.java
@@ -18,24 +18,24 @@ public class CleanupNatives extends CleanupClass {
 public CleanupNatives() {
 }
 
-public void generate(Class clazz) {
+public void generate(JNIClass clazz) {
 	unusedCount = usedCount = 0;
 	super.generate(clazz);
-	Method[] methods = clazz.getDeclaredMethods();
+	JNIMethod[] methods = clazz.getDeclaredMethods();
 	generate(methods);
 	output("used=" + usedCount + " unused=" + unusedCount + " total=" + (unusedCount + usedCount));
 }
 
-public void generate(Method[] methods) {
+public void generate(JNIMethod[] methods) {
 	sort(methods);	
 	for (int i = 0; i < methods.length; i++) {
-		Method method = methods[i];
+		JNIMethod method = methods[i];
 		if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
 		generate(method);
 	}
 }
 
-public void generate(Method method) {
+public void generate(JNIMethod method) {
 	String name = method.getName();
 	Enumeration keys = files.keys();
 	while (keys.hasMoreElements()) {
@@ -85,7 +85,7 @@ public static void main(String[] args) {
 		Class clazz = Class.forName(clazzName);
 		gen.setSourcePath(sourcePath);
 		gen.setClassSourcePath(classSource);
-		gen.generate(clazz);
+		gen.generate(new ReflectClass(clazz));
 	} catch (Exception e) {
 		System.out.println("Problem");
 		e.printStackTrace(System.out);
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ConstantsGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ConstantsGenerator.java
index 9bf3d13a7c..83bc94bbc6 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ConstantsGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ConstantsGenerator.java
@@ -10,34 +10,34 @@
  *******************************************************************************/
 package org.eclipse.swt.tools.internal;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Modifier;
 
 public class ConstantsGenerator extends JNIGenerator {
 
-public void generate(Class clazz) {
-	Field[] fields = clazz.getDeclaredFields();
+public void generate(JNIClass clazz) {
+	JNIField[] fields = clazz.getDeclaredFields();
 	generate(fields);
 }
 
-public void generate(Field[] fields) {
+public void generate(JNIField[] fields) {
 	sort(fields);
 	outputln("int main() {");
 	for (int i = 0; i < fields.length; i++) {
-		Field field = fields[i];
+		JNIField field = fields[i];
 		if ((field.getModifiers() & Modifier.FINAL) == 0) continue;
 		generate(field);
 	}
 	outputln("}");
 }
 
-public void generate(Field field) {
-	Class type = field.getType();
+public void generate(JNIField field) {
+	JNIType type = field.getType();
 	output("\tprintf(\"public static final ");
-	output(getTypeSignature3(field.getType()));
+	output(field.getType().getTypeSignature3(false));
 	output(" ");
 	output(field.getName());
 	output(" = ");
-	if (type == String.class || type == byte[].class) output("\"%s\"");
+	if (type.isType("java.lang.String") || type.isType("[B")) output("\"%s\"");
 	else output("0x%x");
 	output(";\\n\", ");
 	output(field.getName());
@@ -54,7 +54,7 @@ public static void main(String[] args) {
 		for (int i = 0; i < args.length; i++) {
 			String clazzName = args[i];
 			Class clazz = Class.forName(clazzName);
-			gen.generate(clazz);
+			gen.generate(new ReflectClass(clazz));
 		}
 	} catch (Exception e) {
 		System.out.println("Problem");
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/FieldData.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/FieldData.java
deleted file mode 100644
index 7b54d8e4ff..0000000000
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/FieldData.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.tools.internal;
-
-import java.lang.reflect.Field;
-
-public class FieldData extends ItemData {
-	
-	Field field;
-	
-public FieldData(Field field, String str) {
-	super(str);
-	this.field = field;
-}
-
-public static String[] getAllFlags() {
-	return new String[]{FLAG_NO_GEN, FLAG_NO_WINCE};
-}
-
-public String getAccessor() {
-	return (String)getParam("accessor");
-}
-
-public String getCast() {
-	String cast = ((String)getParam("cast")).trim();
-	if (cast.length() > 0) {
-		if (!cast.startsWith("(")) cast = "(" + cast;
-		if (!cast.endsWith(")")) cast = cast + ")";
-	}
-	return cast;
-}
-
-public String getExclude() {
-	return (String)getParam("exclude");
-}
-
-public Field getField() {
-	return field;
-}
-
-public void setAccessor(String str) { 
-	setParam("accessor", str);
-}
-
-public void setCast(String str) {
-	setParam("cast", str);
-}
-
-public void setExclude(String str) { 
-	setParam("exclude", str);
-}
-
-}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ItemData.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ItemData.java
deleted file mode 100644
index 82d8b4fee5..0000000000
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ItemData.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.tools.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-public abstract class ItemData implements Flags {
-
-	HashMap params;
-
-public ItemData(String str) {
-	parse(str);
-}
-
-static String[] split(String str, String separator) {
-	StringTokenizer tk = new StringTokenizer(str, separator);
-	ArrayList result = new ArrayList();
-	while (tk.hasMoreElements()) {
-		result.add(tk.nextElement());
-	}
-	return (String[])result.toArray(new String[result.size()]);
-}
-
-public String[] getFlags() {
-	Object flags = getParam("flags");
-	if (flags == null) return new String[0];
-	if (flags instanceof String[]) return (String[])flags;
-	String[] result = split((String)flags, " ");
-	params.put("flags", result);
-	return result;
-}
-
-public boolean getFlag(String flag) {
-	String[] flags = getFlags();
-	for (int i = 0; i < flags.length; i++) {
-		if (flags[i].equals(flag)) return true;
-	}
-	return false;
-}
-
-public Object getParam(String key) {
-	Object value = params.get(key);
-	return value == null ? "" : value;
-}
-
-public boolean getGenerate() {
-	return !getFlag(FLAG_NO_GEN);
-}
-
-public void parse(String str) {
-	this.params = new HashMap();
-	if (str.length() == 0) return;
-	String[] params = split(str, ",");
-	for (int i = 0; i < params.length; i++) {
-		String param = params[i];
-		int equals = param.indexOf('=');
-		if (equals ==  -1) {
-			System.out.println("Error: " + str + " param " + param);
-		}
-		String key = param.substring(0, equals).trim();
-		String value = param.substring(equals + 1).trim();
-		setParam(key, value);
-	}
-}
-
-public void setFlags(String[] flags) { 
-	setParam("flags", flags);
-}
-
-public void setFlag(String flag, boolean value) {
-	String[] flags = getFlags();
-	HashSet set = new HashSet(Arrays.asList(flags));
-	if (value) {
-		set.add(flag);
-	} else {
-		set.remove(flag);
-	}
-	setFlags((String[])set.toArray(new String[set.size()]));
-}
-
-public void setGenerate(boolean value) {
-	setFlag(FLAG_NO_GEN, !value);
-}
-
-public void setParam(String key, Object value) {
-	params.put(key, value);
-}
-
-public String toString() {
-	StringBuffer buffer = new StringBuffer();
-	Set set = params.keySet();
-	String[] keys = (String[])set.toArray(new String[set.size()]);
-	Arrays.sort(keys);
-	for (int j = 0; j < keys.length; j++) {
-		String key = keys[j];
-		Object value = params.get(key);
-		String valueStr = "";
-		if (value instanceof String) {
-			valueStr = (String)value;
-		} else if (value instanceof String[]) {
-			String[] values = (String[])value;
-			StringBuffer valueBuffer = new StringBuffer();
-			for (int i = 0; i < values.length; i++) {
-				if (i != 0) valueBuffer.append(" ");
-				valueBuffer.append(values[i]);
-			}
-			valueStr = valueBuffer.toString();
-		} else {
-			valueStr = value.toString();
-		}
-		if (valueStr.length() > 0) {
-			if (buffer.length() != 0) buffer.append(",");
-			buffer.append(key);
-			buffer.append("=");
-			buffer.append(valueStr);
-		}
-	}
-	return buffer.toString();
-}
-
-}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ClassData.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIClass.java
index 7fcb8e926c..70ad183c5c 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ClassData.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIClass.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,29 +10,21 @@
  *******************************************************************************/
 package org.eclipse.swt.tools.internal;
 
-public class ClassData extends ItemData {
+public interface JNIClass extends JNIItem {
 	
-	Class clazz;
+public static String[] FLAGS = {FLAG_NO_GEN, FLAG_CPP};
 
-public ClassData(Class clazz, String str) {
-	super(str);
-	this.clazz = clazz;
-}
-	
-public static String[] getAllFlags() {
-	return new String[]{FLAG_NO_GEN, FLAG_CPP};
-}
+public String getName();
 
-public Class getClazz() {
-	return clazz;
-}
+public String getSimpleName();
 
-public String getExclude() {
-	return (String)getParam("exclude");
-}
+public JNIClass getSuperclass();
 
-public void setExclude(String str) { 
-	setParam("exclude", str);
-}
+public JNIField[] getDeclaredFields();
+
+public JNIMethod[] getDeclaredMethods();
+
+public String getExclude();
 
+public void setExclude(String str);
 }
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIField.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIField.java
new file mode 100644
index 0000000000..5e36593c3e
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIField.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tools.internal;
+
+public interface JNIField extends JNIItem {
+	
+public static final String[] FLAGS = {FLAG_NO_GEN, FLAG_NO_WINCE};
+
+public String getName();
+	
+public int getModifiers();
+
+public JNIType getType();
+
+public JNIType getType64();
+
+public JNIClass getDeclaringClass();
+
+public String getAccessor();
+
+public String getCast();
+
+public String getExclude();
+
+public void setAccessor(String str);
+
+public void setCast(String str);
+
+public void setExclude(String str);
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGenerator.java
index 1e78bc74f2..7d7f6fbb2e 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGenerator.java
@@ -11,20 +11,20 @@
 package org.eclipse.swt.tools.internal;
 
 import java.io.*;
-import java.lang.reflect.*;
+import java.lang.reflect.Modifier;
 import java.util.*;
 
-import org.eclipse.swt.SWT;
-
 public abstract class JNIGenerator implements Flags {
 
-	Class mainClass;
-	Class[] classes;
+	JNIClass mainClass;
+	JNIClass[] classes;
 	MetaData metaData;
 	boolean isCPP;
 	String delimiter;
 	PrintStream output;
 	ProgressMonitor progress;
+	
+	static final String JNI64 = "JNI64";
 
 public JNIGenerator() {
 	delimiter = System.getProperty("line.separator");
@@ -50,198 +50,79 @@ String fixDelimiter(String str) {
 	return buffer.toString();
 }
 
-static String getClassName(Class clazz) {
-	String name = clazz.getName();
-	int index = name.lastIndexOf('.') + 1;
-	return name.substring(index, name.length());
-}
-
-static String getFunctionName(Method method) {
+static String getFunctionName(JNIMethod method) {
 	return getFunctionName(method, method.getParameterTypes());
 }
 
-static String getFunctionName(Method method, Class[] paramTypes) {
+static String getFunctionName(JNIMethod method, JNIType[] paramTypes) {
 	if ((method.getModifiers() & Modifier.NATIVE) == 0) return method.getName();
 	String function = toC(method.getName());
-	if (!isNativeUnique(method)) {
+	if (!method.isNativeUnique()) {
 		StringBuffer buffer = new StringBuffer();
 		buffer.append(function);
 		buffer.append("__");
-		if (paramTypes.length > 0) {
-			for (int i = 0; i < paramTypes.length; i++) {
-				Class paramType = paramTypes[i];
-				buffer.append(toC(getTypeSignature(paramType)));
-			}
+		for (int i = 0; i < paramTypes.length; i++) {
+			JNIType paramType = paramTypes[i];
+			buffer.append(toC(paramType.getTypeSignature(false)));
 		}
 		return buffer.toString();
 	}
 	return function;
 }
 
-static int getByteCount(Class clazz) {
-	if (clazz == Integer.TYPE) return 4;
-	if (clazz == Boolean.TYPE) return 4;
-	if (clazz == Long.TYPE) return 8;
-	if (clazz == Short.TYPE) return 2;
-	if (clazz == Character.TYPE) return 2;
-	if (clazz == Byte.TYPE) return 1;
-	if (clazz == Float.TYPE) return 4;
-	if (clazz == Double.TYPE) return 8;
-	return 4;
-}
-
-static String getTypeSignature(Class clazz) {
-	if (clazz == Void.TYPE) return "V";
-	if (clazz == Integer.TYPE) return "I";
-	if (clazz == Boolean.TYPE) return "Z";
-	if (clazz == Long.TYPE) return "J";
-	if (clazz == Short.TYPE) return "S";
-	if (clazz == Character.TYPE) return "C";
-	if (clazz == Byte.TYPE) return "B";
-	if (clazz == Float.TYPE) return "F";
-	if (clazz == Double.TYPE) return "D";
-	if (clazz == String.class) return "Ljava/lang/String;";
-	if (clazz.isArray()) {
-		Class componentType = clazz.getComponentType();
-		return "[" + getTypeSignature(componentType);
-	}
-	return "L" + clazz.getName().replace('.', '/') + ";";
-}
-
-static String getTypeSignature1(Class clazz) {
-	if (clazz == Void.TYPE) return "Void";
-	if (clazz == Integer.TYPE) return "Int";
-	if (clazz == Boolean.TYPE) return "Boolean";
-	if (clazz == Long.TYPE) return "Long";
-	if (clazz == Short.TYPE) return "Short";
-	if (clazz == Character.TYPE) return "Char";
-	if (clazz == Byte.TYPE) return "Byte";
-	if (clazz == Float.TYPE) return "Float";
-	if (clazz == Double.TYPE) return "Double";
-	if (clazz == String.class) return "String";
-	return "Object";
-}
-
-static String getTypeSignature2(Class clazz) {
-	if (clazz == Void.TYPE) return "void";
-	if (clazz == Integer.TYPE) return "jint";
-	if (clazz == Boolean.TYPE) return "jboolean";
-	if (clazz == Long.TYPE) return "jlong";
-	if (clazz == Short.TYPE) return "jshort";
-	if (clazz == Character.TYPE) return "jchar";
-	if (clazz == Byte.TYPE) return "jbyte";
-	if (clazz == Float.TYPE) return "jfloat";
-	if (clazz == Double.TYPE) return "jdouble";
-	if (clazz == String.class) return "jstring";
-	if (clazz == Class.class) return "jclass";
-	if (clazz.isArray()) {
-		Class componentType = clazz.getComponentType();
-		return getTypeSignature2(componentType) + "Array";
-	}
-	return "jobject";
-}
-
-static String getTypeSignature3(Class clazz) {
-	if (clazz == Void.TYPE) return "void";
-	if (clazz == Integer.TYPE) return "int";
-	if (clazz == Boolean.TYPE) return "boolean";
-	if (clazz == Long.TYPE) return "long";
-	if (clazz == Short.TYPE) return "short";
-	if (clazz == Character.TYPE) return "char";
-	if (clazz == Byte.TYPE) return "byte";
-	if (clazz == Float.TYPE) return "float";
-	if (clazz == Double.TYPE) return "double";
-	if (clazz == String.class) return "String";
-	if (clazz.isArray()) {
-		Class componentType = clazz.getComponentType();
-		return getTypeSignature3(componentType) + "[]";
-	}
-	return clazz.getName();
-}
-
-static String getTypeSignature4(Class clazz) {
-	return getTypeSignature4(clazz, false);
-}
-
-static String getTypeSignature4(Class clazz, boolean struct) {
-	if (clazz == Void.TYPE) return "void";
-	if (clazz == Integer.TYPE) return "jint";
-	if (clazz == Boolean.TYPE) return "jboolean";
-	if (clazz == Long.TYPE) return "jlong";
-	if (clazz == Short.TYPE) return "jshort";
-	if (clazz == Character.TYPE) return "jchar";
-	if (clazz == Byte.TYPE) return "jbyte";
-	if (clazz == Float.TYPE) return "jfloat";
-	if (clazz == Double.TYPE) return "jdouble";
-	if (clazz == String.class) return "jstring";
-	if (clazz.isArray()) {
-		Class componentType = clazz.getComponentType();
-		String sig = getTypeSignature4(componentType);
-		return struct ? sig : sig + " *";
-	}
-	String sig = getClassName(clazz); 
-	return struct ? sig : sig + " *";
-}
-
-static HashMap uniqueCache = new HashMap();
-static Class uniqueClassCache;
-static Method[] uniqueMethodsCache;
-static synchronized boolean isNativeUnique(Method method) {
-	if ((method.getModifiers() & Modifier.NATIVE) == 0) return false;
-	Object unique = uniqueCache.get(method);
-	if (unique != null) return ((Boolean)unique).booleanValue();
-	boolean result = true;
-	Method[] methods;
-	String name = method.getName();
-	Class clazz = method.getDeclaringClass();
-	if (clazz.equals(uniqueClassCache)) {
-		methods = uniqueMethodsCache;
-	} else {
-		methods = clazz.getDeclaredMethods();
-		uniqueClassCache = clazz;
-		uniqueMethodsCache = methods;
-	}
-	for (int i = 0; i < methods.length; i++) {
-		Method mth = methods[i];
-		if ((mth.getModifiers() & Modifier.NATIVE) != 0 &&
-			method != mth && !method.equals(mth) &&
-			name.equals(mth.getName()))
-			{
-				result = false;
-				break;
-			}
+static String loadFile (String file) {
+	try {
+		FileReader fr = new FileReader(file);
+		BufferedReader br = new BufferedReader(fr);
+		StringBuffer str = new StringBuffer();
+		char[] buffer = new char[1024];
+		int read;
+		while ((read = br.read(buffer)) != -1) {
+			str.append(buffer, 0, read);
+		}
+		fr.close();
+		return str.toString();
+	} catch (IOException e) {
+		throw new RuntimeException("File not found:" + file, e);
 	}
-	uniqueCache.put(method, new Boolean(result));
-	return result;
 }
 
-static void sort(Method[] methods) {
+static void sort(JNIMethod[] methods) {
 	Arrays.sort(methods, new Comparator() {
 		public int compare(Object a, Object b) {
-			Method mth1 = (Method)a;
-			Method mth2 = (Method)b;
+			JNIMethod mth1 = (JNIMethod)a;
+			JNIMethod mth2 = (JNIMethod)b;
 			int result = mth1.getName().compareTo(mth2.getName());
 			return result != 0 ? result : getFunctionName(mth1).compareTo(getFunctionName(mth2));
 		}
 	});
 }
 
-static void sort(Field[] fields) {
+static void sort(JNIField[] fields) {
 	Arrays.sort(fields, new Comparator() {
 		public int compare(Object a, Object b) {
-			return ((Field)a).getName().compareTo(((Field)b).getName());
+			return ((JNIField)a).getName().compareTo(((JNIField)b).getName());
 		}
 	});
 }
 
-static void sort(Class[] classes) {
+static void sort(JNIClass[] classes) {
 	Arrays.sort(classes, new Comparator() {
 		public int compare(Object a, Object b) {
-			return ((Class)a).getName().compareTo(((Class)b).getName());
+			return ((JNIClass)a).getName().compareTo(((JNIClass)b).getName());
 		}
 	});	
 }
 
+static String[] split(String str, String separator) {
+	StringTokenizer tk = new StringTokenizer(str, separator);
+	ArrayList result = new ArrayList();
+	while (tk.hasMoreElements()) {
+		result.add(tk.nextElement());
+	}
+	return (String[])result.toArray(new String[result.size()]);
+}
+
 static String toC(String str) {
 	int length = str.length();
 	StringBuffer buffer = new StringBuffer(length * 2);
@@ -259,7 +140,7 @@ static String toC(String str) {
 	return buffer.toString();
 }
 
-public abstract void generate(Class clazz);
+public abstract void generate(JNIClass clazz);
 
 public void generateCopyright() {
 }
@@ -273,15 +154,14 @@ public void generate() {
 	generateIncludes();
 	sort(classes);
 	for (int i = 0; i < classes.length; i++) {
-		Class clazz = classes[i];
-		ClassData data = getMetaData().getMetaData(clazz);
-		if (data.getFlag(FLAG_CPP)) {
+		JNIClass clazz = classes[i];
+		if (clazz.getFlag(FLAG_CPP)) {
 			isCPP = true;
 			break;
 		}
 	}
 	for (int i = 0; i < classes.length; i++) {
-		Class clazz = classes[i];
+		JNIClass clazz = classes[i];
 		if (getGenerate(clazz)) generate(clazz);
 		if (progress != null) progress.step();
 	}
@@ -296,15 +176,10 @@ public void generateMetaData(String key) {
 	outputln(fixDelimiter(data));
 }
 
-public Class[] getClasses() {
+public JNIClass[] getClasses() {
 	return classes;
 }
 
-protected boolean getGenerate(Class clazz) {
-	ClassData data = getMetaData().getMetaData(clazz);
-	return !data.getFlag(FLAG_NO_GEN);
-}
-
 public boolean getCPP() {
 	return isCPP;
 }
@@ -321,15 +196,19 @@ public String getFileName() {
 	return getOutputName() + getSuffix() + getExtension();
 }
 
+protected boolean getGenerate(JNIItem item) {
+	return item.getGenerate();
+}
+
 public PrintStream getOutput() {
 	return output;
 }
 
 public String getOutputName() {
-	return getClassName(getMainClass()).toLowerCase();
+	return getMainClass().getSimpleName().toLowerCase();
 }
 
-public Class getMainClass() {
+public JNIClass getMainClass() {
 	return mainClass;
 }
 
@@ -337,10 +216,6 @@ public MetaData getMetaData() {
 	return metaData;
 }
 
-public String getPlatform() {
-	return SWT.getPlatform();
-}
-
 public ProgressMonitor getProgressMonitor() {
 	return progress;
 }
@@ -362,7 +237,7 @@ public void outputln(String str) {
 	output(getDelimiter());
 }
 
-public void setClasses(Class[] classes) {
+public void setClasses(JNIClass[] classes) {
 	this.classes = classes;
 }
 
@@ -370,7 +245,7 @@ public void setDelimiter(String delimiter) {
 	this.delimiter = delimiter;
 }
 
-public void setMainClass(Class mainClass) {
+public void setMainClass(JNIClass mainClass) {
 	this.mainClass = mainClass;
 }
 
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorApp.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorApp.java
index 9f517c4b3c..f8e4e6675f 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorApp.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorApp.java
@@ -21,10 +21,13 @@ import org.eclipse.swt.SWT;
 
 public class JNIGeneratorApp {
 
-	Class mainClass;
+	JNIClass mainClass;
+	JNIClass[] classes;
 	ProgressMonitor progress;
 	String mainClassName, outputDir, classpath;
 	MetaData metaData;
+	
+	static final boolean USE_AST = true;
 
 public JNIGeneratorApp() {
 }
@@ -33,7 +36,7 @@ public String getClasspath() {
 	return classpath;
 }
 
-public Class getMainClass() {
+public JNIClass getMainClass() {
 	return mainClass;
 }
 
@@ -56,13 +59,15 @@ public String getOutputDir() {
 public void generateAll() {
 	String mainClasses = new MetaData(getDefaultMainClass()).getMetaData("swt_main_classes", null);
 	if (mainClasses != null) {
-		String[] list = ItemData.split(mainClasses, ",");
+		String[] list = JNIGenerator.split(mainClasses, ",");
 		for (int i = 0; i < list.length; i += 2) {
 			String className = list[i].trim();
-			try {
-				Class.forName(className, false, getClass().getClassLoader());
-			} catch (Throwable e) {
-				continue;
+			if (!USE_AST) {
+				try {
+					Class.forName(className, false, getClass().getClassLoader());
+				} catch (Throwable e) {
+					continue;
+				}
 			}
 			System.out.println("Generating \"" + className + "\"");
 			setMainClassName(className);
@@ -71,7 +76,7 @@ public void generateAll() {
 	}
 }
 
-void generateSTATS_C(Class[] classes) {
+void generateSTATS_C(JNIClass[] classes) {
 	try {
 		StatsGenerator gen = new StatsGenerator(false);
 		gen.setMainClass(mainClass);
@@ -88,7 +93,7 @@ void generateSTATS_C(Class[] classes) {
 	}
 }
 
-void generateSTATS_H(Class[] classes) {
+void generateSTATS_H(JNIClass[] classes) {
 	try {
 		StatsGenerator gen = new StatsGenerator(true);
 		gen.setMainClass(mainClass);
@@ -105,7 +110,7 @@ void generateSTATS_H(Class[] classes) {
 	}
 }
 
-void generateSTRUCTS_H(Class[] classes) {
+void generateSTRUCTS_H(JNIClass[] classes) {
 	try {
 		StructsGenerator gen = new StructsGenerator(true);
 		gen.setMainClass(mainClass);
@@ -123,7 +128,7 @@ void generateSTRUCTS_H(Class[] classes) {
 
 }
 
-void generateSTRUCTS_C(Class[] classes) {
+void generateSTRUCTS_C(JNIClass[] classes) {
 	try {
 		StructsGenerator gen = new StructsGenerator(false);
 		gen.setMainClass(mainClass);
@@ -141,7 +146,7 @@ void generateSTRUCTS_C(Class[] classes) {
 
 }
 
-void generateSWT_C(Class[] classes) {
+void generateSWT_C(JNIClass[] classes) {
 	try {
 		NativesGenerator gen = new NativesGenerator();
 		gen.setMainClass(mainClass);
@@ -159,7 +164,7 @@ void generateSWT_C(Class[] classes) {
 }
 
 
-void generateMetaData(Class[] classes) {
+void generateMetaData(JNIClass[] classes) {
 	try {
 		MetaDataGenerator gen = new MetaDataGenerator();
 		gen.setMainClass(mainClass);
@@ -168,12 +173,14 @@ void generateMetaData(Class[] classes) {
 		gen.setProgressMonitor(progress);
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		gen.setOutput(new PrintStream(out));
-		gen.generate();
-		if (!new File(getMetaDataDir()).exists()) {
-			System.out.println("Warning: Meta data output dir does not exist");
-			return;
+		if (new File(getMetaDataDir() + gen.getFileName()).exists()) {
+			gen.generate();
+			if (!new File(getMetaDataDir()).exists()) {
+				System.out.println("Warning: Meta data output dir does not exist");
+				return;
+			}
+			if (out.size() > 0) output(out.toByteArray(), getMetaDataDir() + gen.getFileName());
 		}
-		if (out.size() > 0) output(out.toByteArray(), getMetaDataDir() + gen.getFileName());
 	} catch (Exception e) {
 		System.out.println("Problem");
 		e.printStackTrace(System.out);
@@ -185,26 +192,26 @@ public void generate() {
 }
 
 public void generate(ProgressMonitor progress) {
-	if (mainClassName == null) return;
+	if (mainClass == null) return;
 	if (progress != null) progress.setMessage("Initializing...");
-	Class[] classes = getClasses();
-	Class[] natives = getNativesClasses();
-	Class[] structs = getStructureClasses();
+	JNIClass[] classes = getClasses();
+	JNIClass[] natives = getNativesClasses(classes);
+	JNIClass[] structs = getStructureClasses(classes);
 	this.progress = progress;
 	if (progress != null) {
 		int nativeCount = 0;
 		for (int i = 0; i < natives.length; i++) {
-			Class clazz = natives[i];
-			Method[] methods = clazz.getDeclaredMethods();
+			JNIClass clazz = natives[i];
+			JNIMethod[] methods = clazz.getDeclaredMethods();
 			for (int j = 0; j < methods.length; j++) {
-				Method method = methods[j];
+				JNIMethod method = methods[j];
 				if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
 				nativeCount++;
 			}
 		}
 		int total = nativeCount * 4;
 		total += classes.length;
-		total += natives.length * 3;
+		total += natives.length * (3);
 		total += structs.length * 2;
 		progress.setTotal(total);
 		progress.setMessage("Generating structs.h ...");
@@ -310,16 +317,24 @@ String[] getClassNames(String mainClassName) {
 	return (String[])classes.toArray(new String[classes.size()]);
 }
 
-public Class[] getClasses() {
-	if (mainClassName == null) return new Class[0];
+public JNIClass[] getClasses() {
+	if (classes != null) return classes;
+	if (mainClassName == null) return new JNIClass[0];
+	if (USE_AST) return getASTClasses();
 	String[] classNames = getClassNames(mainClassName);
 	Arrays.sort(classNames);
 	String packageName = getPackageName(mainClassName);
-	Class[] classes = new Class[classNames.length];
+	JNIClass[] classes = new JNIClass[classNames.length];
 	for (int i = 0; i < classNames.length; i++) {
 		String className = classNames[i];
 		try {
-			classes[i] = Class.forName(packageName + "." + className, false, getClass().getClassLoader());
+			String qualifiedName = packageName + "." + className;
+			if (qualifiedName.equals(mainClassName)) {
+				classes[i] = mainClass;
+			} else {
+				String sourcePath = new File(outputDir).getParent() + "/" + qualifiedName.replace('.', '/') + ".java";
+				classes[i] = new ReflectClass(Class.forName(qualifiedName, false, getClass().getClassLoader()), metaData, sourcePath);
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -327,15 +342,41 @@ public Class[] getClasses() {
 	return classes;
 }
 
-public Class[] getNativesClasses() {
-	if (mainClassName == null) return new Class[0];
+public JNIClass[] getASTClasses() {
+	if (classes != null) return classes;
+	if (mainClassName == null) return new JNIClass[0];
+	String root = new File(outputDir).getParent();
+	String mainPath = root + "/" + mainClassName.replace('.', '/') + ".java";
+	ArrayList classes = new ArrayList();
+	String packageName = getPackageName(mainClassName);
+	File dir = new File(root + "/" + packageName.replace('.', '/'));
+	File[] files = dir.listFiles();
+	for (int i = 0; i < files.length; i++) {
+		File file = files[i];
+		try {
+			String path = file.getAbsolutePath().replace('\\', '/');
+			if (path.endsWith(".java")) {
+				if (mainPath.equals(path)){
+					classes.add(mainClass);
+				} else {
+					classes.add(new ASTClass(path, metaData));
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	return (JNIClass[])classes.toArray(new JNIClass[classes.size()]);
+}
+
+public JNIClass[] getNativesClasses(JNIClass[] classes) {
+	if (mainClass == null) return new JNIClass[0];
 	ArrayList result = new ArrayList();
-	Class[] classes = getClasses();
 	for (int i = 0; i < classes.length; i++) {
-		Class clazz = classes[i];
-		Method[] methods = clazz.getDeclaredMethods();
+		JNIClass clazz = classes[i];
+		JNIMethod[] methods = clazz.getDeclaredMethods();
 		for (int j = 0; j < methods.length; j++) {
-			Method method = methods[j];
+			JNIMethod method = methods[j];
 			int mods = method.getModifiers();
 			if ((mods & Modifier.NATIVE) != 0) {
 				result.add(clazz);
@@ -343,26 +384,25 @@ public Class[] getNativesClasses() {
 			}
 		}
 	}
-	return (Class[])result.toArray(new Class[result.size()]);
+	return (JNIClass[])result.toArray(new JNIClass[result.size()]);
 }
 
-public Class[] getStructureClasses() {
-	if (mainClassName == null) return new Class[0];
+public JNIClass[] getStructureClasses(JNIClass[] classes) {
+	if (mainClass == null) return new JNIClass[0];
 	ArrayList result = new ArrayList();
-	Class[] classes = getClasses();
 	outer:
 	for (int i = 0; i < classes.length; i++) {
-		Class clazz = classes[i];
-		Method[] methods = clazz.getDeclaredMethods();
+		JNIClass clazz = classes[i];
+		JNIMethod[] methods = clazz.getDeclaredMethods();
 		for (int j = 0; j < methods.length; j++) {
-			Method method = methods[j];
+			JNIMethod method = methods[j];
 			int mods = method.getModifiers();
 			if ((mods & Modifier.NATIVE) != 0) continue outer;
 		}
-		Field[] fields = clazz.getFields();
+		JNIField[] fields = clazz.getDeclaredFields();
 		boolean hasPublicFields = false;
 		for (int j = 0; j < fields.length; j++) {
-			Field field = fields[j];
+			JNIField field = fields[j];
 			int mods = field.getModifiers();
 			if ((mods & Modifier.PUBLIC) != 0 && (mods & Modifier.STATIC) == 0) {
 				hasPublicFields = true;
@@ -372,19 +412,31 @@ public Class[] getStructureClasses() {
 		if (!hasPublicFields) continue;
 		result.add(clazz);
 	}
-	return (Class[])result.toArray(new Class[result.size()]);
+	return (JNIClass[])result.toArray(new JNIClass[result.size()]);
 }
 
 public void setClasspath(String classpath) {
 	this.classpath = classpath;
 }
 
+public void setMainClass(JNIClass mainClass) {
+	this.mainClass = mainClass;
+}
+
+public void setMetaData(MetaData data) {
+	this.metaData = data;
+}
+
+public void setClasses(JNIClass[] classes) {
+	this.classes = classes;
+}
+
 public void setMainClassName(String str) {
 	mainClassName = str;
 	metaData = new MetaData(mainClassName);
 	String mainClasses = getMetaData().getMetaData("swt_main_classes", null);
 	if (mainClasses != null) {
-		String[] list = ItemData.split(mainClasses, ",");
+		String[] list = JNIGenerator.split(mainClasses, ",");
 		for (int i = 0; i < list.length; i += 2) {
 			if (mainClassName.equals(list[i].trim())) {
 				setOutputDir(list[i + 1].trim());
@@ -393,12 +445,32 @@ public void setMainClassName(String str) {
 	}
 	if (mainClassName != null) {
 		try {
-			mainClass = Class.forName(mainClassName, false, getClass().getClassLoader());
+			String sourcePath = new File(outputDir).getParent() + "/" + mainClassName.replace('.', '/') + ".java";
+			if (USE_AST) {
+				mainClass = new ASTClass(sourcePath, metaData);
+			} else {
+				mainClass = new ReflectClass(Class.forName(mainClassName, false, getClass().getClassLoader()), metaData, sourcePath);
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
 }
+public void setMainClassName(String str, String outputDir) {
+	mainClassName = str;
+	setOutputDir(outputDir);
+	metaData = new MetaData(mainClassName);
+	try {
+		String sourcePath = new File(this.outputDir).getParent() + "/" + mainClassName.replace('.', '/') + ".java";
+		if (USE_AST) {
+			mainClass = new ASTClass(sourcePath, metaData);
+		} else {
+			mainClass = new ReflectClass(Class.forName(mainClassName, false, getClass().getClassLoader()), metaData, sourcePath);
+		}
+	} catch (Exception e) {
+		e.printStackTrace();
+	}
+}
 
 public void setOutputDir(String str) {
 	if (str != null) {
@@ -406,7 +478,7 @@ public void setOutputDir(String str) {
 			str += File.separator;
 		}
 	}
-	outputDir = str;
+	outputDir = str.replace('\\', '/');
 }
 
 public static String getDefaultMainClass() {
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorAppUI.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorAppUI.java
index 597921a66f..5ee66407ae 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorAppUI.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIGeneratorAppUI.java
@@ -124,7 +124,7 @@ void generateMetaData () {
 	MetaDataGenerator gen = new MetaDataGenerator();
 	gen.setMainClass(app.getMainClass());
 	gen.setMetaData(app.getMetaData());
-	Method[] methods = getSelectedMethods();
+	JNIMethod[] methods = getSelectedMethods();
 	if (methods.length != 0) {
 		gen.generate(methods);
 	} else {
@@ -137,7 +137,7 @@ void generateNatives () {
 	NativesGenerator gen = new NativesGenerator();
 	gen.setMainClass(app.getMainClass());
 	gen.setMetaData(app.getMetaData());
-	Method[] methods = getSelectedMethods();
+	JNIMethod[] methods = getSelectedMethods();
 	if (methods.length != 0) {
 		gen.generate(methods);
 	} else {
@@ -222,7 +222,7 @@ void generateConstants () {
 	ConstantsGenerator gen = new ConstantsGenerator();
 	gen.setMainClass(app.getMainClass());
 	gen.setMetaData(app.getMetaData());
-	Field[] fields = getSelectedFields();
+	JNIField[] fields = getSelectedFields();
 	if (fields.length != 0) {
 		gen.generate(fields);
 	} else {
@@ -231,50 +231,48 @@ void generateConstants () {
 	}
 }
 
-Class[] getSelectedClasses() {
+JNIClass[] getSelectedClasses() {
 	TableItem[] items = classesLt.getSelection();
-	Class[] classes = new Class[items.length];
+	JNIClass[] classes = new JNIClass[items.length];
 	for (int i = 0; i < items.length; i++) {
 		TableItem item = items[i];
-		classes[i] = ((ClassData)item.getData()).getClazz();
+		classes[i] = (JNIClass)item.getData();
 	}
 	return classes;
 }
 
-Method[] getSelectedMethods() {
+JNIMethod[] getSelectedMethods() {
 	TableItem[] selection = membersLt.getSelection();
-	Method[] methods = new Method[selection.length];
+	JNIMethod[] methods = new JNIMethod[selection.length];
 	int count = 0;
 	for (int i = 0; i < selection.length; i++) {
 		TableItem item = selection [i];
 		Object data = item.getData();
-		if (data instanceof MethodData) {
-			Method method = ((MethodData)data).getMethod();
-			methods[count++] = method;
+		if (data instanceof JNIMethod) {
+			methods[count++] = (JNIMethod)data;
 		}
 	}
 	if (count != methods.length) {
-		Method[] result = new Method[count];
+		JNIMethod[] result = new JNIMethod[count];
 		System.arraycopy(methods, 0, result, 0, count);
 		methods = result;
 	}
 	return methods;
 }
 
-Field[] getSelectedFields() {
+JNIField[] getSelectedFields() {
 	TableItem[] selection = membersLt.getSelection();
-	Field[] fields = new Field[selection.length];
+	JNIField[] fields = new JNIField[selection.length];
 	int count = 0;
 	for (int i = 0; i < selection.length; i++) {
 		TableItem item = selection [i];
 		Object data = item.getData();
-		if (data instanceof FieldData) {
-			Field field = ((FieldData)data).getField();
-			fields[count++] = field;
+		if (data instanceof JNIField) {
+			fields[count++] = (JNIField)data;
 		}
 	}
 	if (count != fields.length) {
-		Field[] result = new Field[count];
+		JNIField[] result = new JNIField[count];
 		System.arraycopy(fields, 0, result, 0, count);
 		fields = result;
 	}
@@ -349,7 +347,7 @@ void createMainClassPanel(Composite panel, Listener updateListener) {
 
 	String mainClasses = app.getMetaData().getMetaData("swt_main_classes", null);
 	if (mainClasses != null) {
-		String[] list = ItemData.split(mainClasses, ",");
+		String[] list = JNIGenerator.split(mainClasses, ",");
 		for (int i = 0; i < list.length; i += 2) {
 			String className = list[i].trim();
 			try {
@@ -410,13 +408,11 @@ void createClassesPanel(Composite panel) {
 			TableItem item = classTextEditor.getItem();
 			if (item == null) return;
 			int column = classTextEditor.getColumn();
-			ClassData classData = (ClassData)item.getData();
+			JNIClass clazz = (JNIClass)item.getData();
 			if (column == CLASS_EXCLUDE_COLUMN) {
 				String text = classEditorTx.getText();
-				classData.setExclude(text);
-				item.setText(column, classData.getExclude());
-				MetaData metaData = app.getMetaData();
-				metaData.setMetaData(classData.getClazz(), classData);
+				clazz.setExclude(text);
+				item.setText(column, clazz.getExclude());
 				classesLt.getColumn(column).pack();
 			}
 		}
@@ -429,7 +425,7 @@ void createClassesPanel(Composite panel) {
 	floater.setLayout(new FillLayout());
 	classListEditor = new FlagsEditor(classesLt);
 	classEditorLt = new List(floater, SWT.MULTI | SWT.BORDER);
-	classEditorLt.setItems(ClassData.getAllFlags());
+	classEditorLt.setItems(JNIClass.FLAGS);
 	floater.pack();
 	floater.addListener(SWT.Close, new Listener() {
 		public void handleEvent(Event e) {
@@ -452,14 +448,12 @@ void createClassesPanel(Composite panel) {
 			TableItem item = classListEditor.getItem();
 			if (item == null) return;
 			int column = classListEditor.getColumn();
-			ClassData classData = (ClassData)item.getData();
+			JNIClass clazz = (JNIClass)item.getData();
 			if (column == CLASS_FLAGS_COLUMN) {
 				String[] flags = classEditorLt.getSelection();
-				classData.setFlags(flags);
-				item.setText(column, getFlagsString(classData.getFlags()));
-				item.setChecked(classData.getGenerate());
-				MetaData metaData = app.getMetaData();
-				metaData.setMetaData(classData.getClazz(), classData);
+				clazz.setFlags(flags);
+				item.setText(column, getFlagsString(clazz.getFlags()));
+				item.setChecked(clazz.getGenerate());
 				classesLt.getColumn(column).pack();
 			}
 		}
@@ -485,7 +479,7 @@ void createClassesPanel(Composite panel) {
 						}				
 					}
 					if (column == -1) return;
-					ClassData data = (ClassData)item.getData();
+					JNIClass data = (JNIClass)item.getData();
 					if (column == CLASS_EXCLUDE_COLUMN) {
 						classTextEditor.setColumn(column);
 						classTextEditor.setItem(item);
@@ -580,45 +574,42 @@ void createMembersPanel(Composite panel) {
 			TableItem item = memberTextEditor.getItem();
 			if (item == null) return;
 			int column = memberTextEditor.getColumn();
-			ItemData memberData = (ItemData)item.getData();
+			JNIItem memberData = (JNIItem)item.getData();
 			String text = memberEditorTx.getText();
-			MetaData metaData = app.getMetaData();
-			if (memberData instanceof FieldData) {
-				FieldData fieldData = (FieldData)memberData;
+			if (memberData instanceof JNIField) {
+				JNIField field = (JNIField)memberData;
 				switch (column) {
 					case FIELD_CAST_COLUMN: {
-						fieldData.setCast(text);
-						item.setText(column, fieldData.getCast());
+						field.setCast(text);
+						item.setText(column, field.getCast());
 						break;
 					}
 					case FIELD_ACCESSOR_COLUMN: {
-						fieldData.setAccessor(text.equals(fieldData.getField().getName()) ? "" : text);
-						item.setText(column, fieldData.getAccessor());
+						field.setAccessor(text.equals(field.getName()) ? "" : text);
+						item.setText(column, field.getAccessor());
 						break;
 					}
 					case FIELD_EXCLUDE_COLUMN: {
-						fieldData.setExclude(text);
-						item.setText(column, fieldData.getExclude());
+						field.setExclude(text);
+						item.setText(column, field.getExclude());
 						break;
 					}
 				}
-				metaData.setMetaData(fieldData.getField(), fieldData);
 				membersLt.getColumn(column).pack();
-			} else if (memberData instanceof MethodData) {
-				MethodData methodData = (MethodData)memberData;
+			} else if (memberData instanceof JNIMethod) {
+				JNIMethod method = (JNIMethod)memberData;
 				switch (column) {
 					case METHOD_ACCESSOR_COLUMN: {
-						methodData.setAccessor(text.equals(methodData.getMethod().getName()) ? "" : text);
-						item.setText(column, methodData.getAccessor());
+						method.setAccessor(text.equals(method.getName()) ? "" : text);
+						item.setText(column, method.getAccessor());
 						break;
 					}
 					case METHOD_EXCLUDE_COLUMN: {
-						methodData.setExclude(text);
-						item.setText(column, methodData.getExclude());
+						method.setExclude(text);
+						item.setText(column, method.getExclude());
 						break;
 					}
 				}
-				metaData.setMetaData(methodData.getMethod(), methodData);
 				membersLt.getColumn(column).pack();
 			}
 		}
@@ -652,21 +643,12 @@ void createMembersPanel(Composite panel) {
 			TableItem item = memberListEditor.getItem();
 			if (item == null) return;
 			int column = memberListEditor.getColumn();
-			ItemData data = (ItemData)item.getData();
+			JNIItem data = (JNIItem)item.getData();
 			String[] flags = memberEditorLt.getSelection();
 			data.setFlags(flags);
 			item.setText(column, getFlagsString(data.getFlags()));
 			item.setChecked(data.getGenerate());
-			MetaData metaData = app.getMetaData();
-			if (data instanceof FieldData) {
-				FieldData fieldData = (FieldData)data;
-				metaData.setMetaData(fieldData.getField(), fieldData);
-				membersLt.getColumn(column).pack();
-			} else if (data instanceof MethodData) {
-				MethodData methodData = (MethodData)data;
-				metaData.setMetaData(methodData.getMethod(), methodData);
-				membersLt.getColumn(column).pack();
-			}
+			membersLt.getColumn(column).pack();
 		}
 	};
 	memberEditorLt.addListener(SWT.DefaultSelection, memberListListener);
@@ -690,19 +672,19 @@ void createMembersPanel(Composite panel) {
 						}				
 					}
 					if (column == -1) return;
-					ItemData itemData = (ItemData)item.getData();
-					if (itemData instanceof FieldData) {
-						FieldData data = (FieldData)itemData;
+					Object itemData = item.getData();
+					if (itemData instanceof JNIField) {
+						JNIField field = (JNIField)itemData;
 						if (column == FIELD_CAST_COLUMN || column == FIELD_ACCESSOR_COLUMN || column == FIELD_EXCLUDE_COLUMN) {
 							memberTextEditor.setColumn(column);
 							memberTextEditor.setItem(item);
 							String text = "";
 							switch (column) {
-								case FIELD_CAST_COLUMN: text = data.getCast(); break;
+								case FIELD_CAST_COLUMN: text = field.getCast(); break;
 								case FIELD_ACCESSOR_COLUMN: {
-									text = data.getAccessor(); 
+									text = field.getAccessor(); 
 									if (text.length() == 0) {
-										text = data.getField().getName();
+										text = field.getName();
 										int index = text.lastIndexOf('_');
 										if (index != -1) {
 											char[] chars = text.toCharArray();
@@ -712,7 +694,7 @@ void createMembersPanel(Composite panel) {
 									}
 									break;
 								}
-								case FIELD_EXCLUDE_COLUMN: text = data.getExclude(); break;
+								case FIELD_EXCLUDE_COLUMN: text = field.getExclude(); break;
 							}
 							memberEditorTx.setText(text);
 							memberEditorTx.selectAll();
@@ -721,26 +703,26 @@ void createMembersPanel(Composite panel) {
 						} else if (column == FIELD_FLAGS_COLUMN) {
 							memberListEditor.setColumn(column);
 							memberListEditor.setItem(item);
-							memberEditorLt.setItems(FieldData.getAllFlags());
-							memberEditorLt.setSelection(data.getFlags());
+							memberEditorLt.setItems(JNIField.FLAGS);
+							memberEditorLt.setSelection(field.getFlags());
 							floater.setLocation(membersLt.toDisplay(e.x, e.y));
 							floater.pack();
 							floater.setVisible(true);
 							memberEditorLt.setFocus();
 						}
-					} else if (itemData instanceof MethodData) {
-						MethodData data = (MethodData)itemData;
+					} else if (itemData instanceof JNIMethod) {
+						JNIMethod method = (JNIMethod)itemData;
 						if (column == METHOD_EXCLUDE_COLUMN || column == METHOD_ACCESSOR_COLUMN) {
 							memberTextEditor.setColumn(column);
 							memberTextEditor.setItem(item);
 							String text = "";
 							switch (column) {
 								case METHOD_ACCESSOR_COLUMN: {
-									text = data.getAccessor();
-									if (text.length() == 0) text = data.getMethod().getName();
+									text = method.getAccessor();
+									if (text.length() == 0) text = method.getName();
 									break;
 								}
-								case METHOD_EXCLUDE_COLUMN: text = data.getExclude(); break;
+								case METHOD_EXCLUDE_COLUMN: text = method.getExclude(); break;
 							}
 							memberEditorTx.setText(text);
 							memberEditorTx.selectAll();
@@ -749,8 +731,8 @@ void createMembersPanel(Composite panel) {
 						} else if (column == METHOD_FLAGS_COLUMN) {
 							memberListEditor.setColumn(column);
 							memberListEditor.setItem(item);
-							memberEditorLt.setItems(MethodData.getAllFlags());
-							memberEditorLt.setSelection(data.getFlags());
+							memberEditorLt.setItems(JNIMethod.FLAGS);
+							memberEditorLt.setSelection(method.getFlags());
 							floater.setLocation(membersLt.toDisplay(e.x, e.y));
 							floater.pack();
 							floater.setVisible(true);
@@ -809,13 +791,11 @@ void createParametersPanel(Composite panel) {
 			TableItem item = paramTextEditor.getItem();
 			if (item == null) return;
 			int column = paramTextEditor.getColumn();
-			ParameterData paramData = (ParameterData)item.getData();
+			JNIParameter param = (JNIParameter)item.getData();
 			if (column == PARAM_CAST_COLUMN) {
 				String text = paramEditorTx.getText();
-				paramData.setCast(text);
-				item.setText(column, paramData.getCast());
-				MetaData metaData = app.getMetaData();
-				metaData.setMetaData(paramData.getMethod(), paramData.getParameter(), paramData);
+				param.setCast(text);
+				item.setText(column, param.getCast());
 				paramsLt.getColumn(column).pack();
 			}
 		}
@@ -828,7 +808,7 @@ void createParametersPanel(Composite panel) {
 	floater.setLayout(new FillLayout());
 	paramListEditor = new FlagsEditor(paramsLt);
 	paramEditorLt = new List(floater, SWT.MULTI | SWT.BORDER);
-	paramEditorLt.setItems(ParameterData.getAllFlags());
+	paramEditorLt.setItems(JNIParameter.FLAGS);
 	floater.pack();
 	floater.addListener(SWT.Close, new Listener() {
 		public void handleEvent(Event e) {
@@ -851,13 +831,11 @@ void createParametersPanel(Composite panel) {
 			TableItem item = paramListEditor.getItem();
 			if (item == null) return;
 			int column = paramListEditor.getColumn();
-			ParameterData paramData = (ParameterData)item.getData();
+			JNIParameter param = (JNIParameter)item.getData();
 			if (column == PARAM_FLAGS_COLUMN) {
 				String[] flags = paramEditorLt.getSelection();
-				paramData.setFlags(flags);
-				item.setText(column, getFlagsString(paramData.getFlags()));
-				MetaData metaData = app.getMetaData();
-				metaData.setMetaData(paramData.getMethod(), paramData.getParameter(), paramData);
+				param.setFlags(flags);
+				item.setText(column, getFlagsString(param.getFlags()));
 				paramsLt.getColumn(column).pack();
 			}
 		}
@@ -883,18 +861,18 @@ void createParametersPanel(Composite panel) {
 						}				
 					}
 					if (column == -1) return;
-					ParameterData data = (ParameterData)item.getData();
+					JNIParameter param = (JNIParameter)item.getData();
 					if (column == PARAM_CAST_COLUMN) {
 						paramTextEditor.setColumn(column);
 						paramTextEditor.setItem(item);
-						paramEditorTx.setText(data.getCast());
+						paramEditorTx.setText(param.getCast());
 						paramEditorTx.selectAll();
 						paramEditorTx.setVisible(true);
 						paramEditorTx.setFocus();
 					} else if (column == PARAM_FLAGS_COLUMN) {
 						paramListEditor.setColumn(column);
 						paramListEditor.setItem(item);
-						paramEditorLt.setSelection(data.getFlags());
+						paramEditorLt.setSelection(param.getFlags());
 						floater.setLocation(paramsLt.toDisplay(e.x, e.y));
 						floater.setVisible(true);
 						paramEditorLt.setFocus();
@@ -996,8 +974,8 @@ String getPackageString(String className) {
 	return app.getMainClassName().substring(0, dot);
 }
 
-String getClassString(Class clazz) {
-	String name = JNIGenerator.getTypeSignature3(clazz);
+String getClassString(JNIType type) {
+	String name = type.getTypeSignature3(false);
 	int index = name.lastIndexOf('.');
 	if (index == -1) return name;
 	return name.substring(index + 1, name.length());
@@ -1014,16 +992,16 @@ String getFlagsString(String[] flags) {
 	return buffer.toString();
 }
 
-String getMethodString(Method method) {
+String getMethodString(JNIMethod method) {
 	String pkgName = getPackageString(method.getDeclaringClass().getName());
 	StringBuffer buffer = new StringBuffer();
 	buffer.append(method.getName());
 	buffer.append("(");
-	Class[] params = method.getParameterTypes();
+	JNIParameter[] params = method.getParameters();
 	for (int i = 0; i < params.length; i++) {
-		Class param = params[i];
+		JNIParameter param = params[i];
 		if (i != 0) buffer.append(",");
-		String string = JNIGenerator.getTypeSignature3(param);
+		String string = param.getType().getTypeSignature3(false);
 		if (string.startsWith(pkgName)) string = string.substring(pkgName.length() + 1);
 		buffer.append(string);
 	}
@@ -1031,24 +1009,22 @@ String getMethodString(Method method) {
 	return buffer.toString();
 }
 
-String getFieldString(Field field) {
+String getFieldString(JNIField field) {
 	return field.getName();
 }
 
 void updateClasses() {
 	classesLt.removeAll();
-	MetaData metaData = app.getMetaData();
-	Class[] classes = app.getClasses();
+	JNIClass[] classes = app.getClasses();
 	int mainIndex = 0;
 	for (int i = 0; i < classes.length; i++) {
-		Class clazz = classes[i];
+		JNIClass clazz = classes[i];
 		if (clazz.equals(app.getMainClass())) mainIndex = i;
-		ClassData classData = metaData.getMetaData(clazz);
 		TableItem item = new TableItem(classesLt, SWT.NONE);
-		item.setData(classData);
-		item.setText(CLASS_NAME_COLUMN, getClassString(clazz));
-		item.setText(CLASS_FLAGS_COLUMN, getFlagsString(classData.getFlags()));
-		item.setChecked(classData.getGenerate());
+		item.setData(clazz);
+		item.setText(CLASS_NAME_COLUMN, clazz.getSimpleName());
+		item.setText(CLASS_FLAGS_COLUMN, getFlagsString(clazz.getFlags()));
+		item.setChecked(clazz.getGenerate());
 	}
 	TableColumn[] columns = classesLt.getColumns();
 	for (int i = 0; i < columns.length; i++) {
@@ -1060,7 +1036,6 @@ void updateClasses() {
 
 void updateMembers() {
 	membersLt.removeAll();
-	MetaData metaData = app.getMetaData();
 	membersLt.setHeaderVisible(false);
 	TableColumn[] columns = membersLt.getColumns();
 	for (int i = 0; i < columns.length; i++) {
@@ -1070,12 +1045,11 @@ void updateMembers() {
 	int[] indices = classesLt.getSelectionIndices();
 	if (indices.length != 1) return;
 	TableItem classItem = classesLt.getItem(indices[0]);
-	ClassData classData = (ClassData)classItem.getData();
-	Class clazz = classData.getClazz();
+	JNIClass clazz = (JNIClass)classItem.getData();
 	boolean hasNatives = false;
-	Method[] methods = clazz.getDeclaredMethods();
+	JNIMethod[] methods = clazz.getDeclaredMethods();
 	for (int i = 0; i < methods.length; i++) {
-		Method method = methods[i];
+		JNIMethod method = methods[i];
 		int mods = method.getModifiers();
 		if (hasNatives =((mods & Modifier.NATIVE) != 0)) break;
 	}
@@ -1094,15 +1068,14 @@ void updateMembers() {
 		*/
 		JNIGenerator.sort(methods);
 		for (int i = 0; i < methods.length; i++) {
-			Method method = methods[i];
+			JNIMethod method = methods[i];
 			if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
-			MethodData methodData = metaData.getMetaData(method);
 			TableItem item = new TableItem(membersLt, SWT.NONE);
-			item.setData(methodData);
+			item.setData(method);
 			item.setText(METHOD_NAME_COLUMN, getMethodString(method));
-			item.setChecked(methodData.getGenerate());
-			item.setText(METHOD_FLAGS_COLUMN, getFlagsString(methodData.getFlags()));
-			item.setText(METHOD_ACCESSOR_COLUMN, methodData.getAccessor());
+			item.setChecked(method.getGenerate());
+			item.setText(METHOD_FLAGS_COLUMN, getFlagsString(method.getFlags()));
+			item.setText(METHOD_ACCESSOR_COLUMN, method.getAccessor());
 			/*
 			item.setText(METHOD_EXCLUDE_COLUMN, methodData.getExclude());
 			*/
@@ -1121,21 +1094,20 @@ void updateMembers() {
 		column = new TableColumn(membersLt, SWT.NONE, FIELD_EXCLUDE_COLUMN);
 		column.setText("Exclude");
 		*/
-		Field[] fields = clazz.getDeclaredFields();	
+		JNIField[] fields = clazz.getDeclaredFields();	
 		for (int i = 0; i < fields.length; i++) {
-			Field field = fields[i];
+			JNIField field = fields[i];
 			int mods = field.getModifiers(); 
 			if (((mods & Modifier.PUBLIC) == 0) ||
 				((mods & Modifier.FINAL) != 0) ||
 				((mods & Modifier.STATIC) != 0)) continue;
-			FieldData fieldData = metaData.getMetaData(field);
 			TableItem item = new TableItem(membersLt, SWT.NONE);
-			item.setData(fieldData);
+			item.setData(field);
 			item.setText(FIELD_NAME_COLUMN, getFieldString(field));
-			item.setChecked(fieldData.getGenerate());
-			item.setText(FIELD_CAST_COLUMN, fieldData.getCast());
-			item.setText(FIELD_FLAGS_COLUMN, getFlagsString(fieldData.getFlags()));
-			item.setText(FIELD_ACCESSOR_COLUMN, fieldData.getAccessor());
+			item.setChecked(field.getGenerate());
+			item.setText(FIELD_CAST_COLUMN, field.getCast());
+			item.setText(FIELD_FLAGS_COLUMN, getFlagsString(field.getFlags()));
+			item.setText(FIELD_ACCESSOR_COLUMN, field.getAccessor());
 			/*
 			item.setText(FIELD_EXCLUDE_COLUMN, fieldData.getExclude());
 			*/
@@ -1152,7 +1124,6 @@ void updateMembers() {
 
 void updateParameters() {
 	paramsLt.removeAll();
-	MetaData metaData = app.getMetaData();
 	int[] indices = membersLt.getSelectionIndices();
 	if (indices.length != 1) {
 		paramsLt.setHeaderVisible(false);
@@ -1160,20 +1131,18 @@ void updateParameters() {
 	}
 	TableItem memberItem = membersLt.getItem(indices[0]);
 	Object data = memberItem.getData();
-	if (!(data instanceof MethodData)) return;
+	if (!(data instanceof JNIMethod)) return;
 	paramsLt.setRedraw(false);
-	MethodData methodData = (MethodData)memberItem.getData();
-	Method method = methodData.getMethod();
-	Class[] params = method.getParameterTypes();
+	JNIMethod method = (JNIMethod)data;
+	JNIParameter[] params = method.getParameters();
 	for (int i = 0; i < params.length; i++) {
-		Class param = params[i];
-		ParameterData paramData = metaData.getMetaData(method, i);
+		JNIParameter param = params[i];
 		TableItem item = new TableItem(paramsLt, SWT.NONE);
-		item.setData(paramData);
+		item.setData(param);
 		item.setText(PARAM_INDEX_COLUMN, String.valueOf(i));
-		item.setText(PARAM_TYPE_COLUMN, getClassString(param));
-		item.setText(PARAM_CAST_COLUMN, paramData.getCast());
-		item.setText(PARAM_FLAGS_COLUMN, getFlagsString(paramData.getFlags()));
+		item.setText(PARAM_TYPE_COLUMN, getClassString(param.getType()));
+		item.setText(PARAM_CAST_COLUMN, param.getCast());
+		item.setText(PARAM_FLAGS_COLUMN, getFlagsString(param.getFlags()));
 	}
 	TableColumn[] columns = paramsLt.getColumns();
 	for (int i = 0; i < columns.length; i++) {
@@ -1185,25 +1154,25 @@ void updateParameters() {
 }
 
 void updateGenerate(TableItem item) {
-	MetaData metaData = app.getMetaData();
-	ItemData itemData = (ItemData)item.getData();
+	JNIItem itemData = (JNIItem)item.getData();
 	itemData.setGenerate(item.getChecked());
-	if (itemData instanceof ClassData) {
-		ClassData data = (ClassData)itemData;
-		metaData.setMetaData(data.getClazz(), data);
-	} else if (itemData instanceof FieldData) {
-		FieldData data = (FieldData)itemData;
-		item.setText(FIELD_FLAGS_COLUMN, getFlagsString(data.getFlags()));
-		metaData.setMetaData(data.getField(), data);
-	} else if (itemData instanceof MethodData) {
-		MethodData data = (MethodData)itemData;
-		item.setText(METHOD_FLAGS_COLUMN, getFlagsString(data.getFlags()));
-		metaData.setMetaData(data.getMethod(), data);
-	} else if (itemData instanceof ParameterData) {
-		ParameterData data = (ParameterData)itemData;
-		item.setText(PARAM_FLAGS_COLUMN, getFlagsString(data.getFlags()));
-		metaData.setMetaData(data.getMethod(), data.getParameter(), data);
-	}
+//	MetaData metaData = app.getMetaData();
+//	if (itemData instanceof JNIClass) {
+//		ClassData data = (ClassData)itemData;
+//		metaData.setMetaData(data.getClazz(), data);
+//	} else if (itemData instanceof FieldData) {
+//		FieldData data = (FieldData)itemData;
+//		item.setText(FIELD_FLAGS_COLUMN, getFlagsString(data.getFlags()));
+//		metaData.setMetaData(data.getField(), data);
+//	} else if (itemData instanceof MethodData) {
+//		MethodData data = (MethodData)itemData;
+//		item.setText(METHOD_FLAGS_COLUMN, getFlagsString(data.getFlags()));
+//		metaData.setMetaData(data.getMethod(), data);
+//	} else if (itemData instanceof ParameterData) {
+//		ParameterData data = (ParameterData)itemData;
+//		item.setText(PARAM_FLAGS_COLUMN, getFlagsString(data.getFlags()));
+//		metaData.setMetaData(data.getMethod(), data.getParameter(), data);
+//	}
 }
 
 boolean updateOutputDir() {
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIItem.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIItem.java
new file mode 100644
index 0000000000..7c9bac9a8d
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIItem.java
@@ -0,0 +1,23 @@
+package org.eclipse.swt.tools.internal;
+
+public interface JNIItem extends Flags {
+	
+	public static final boolean GEN64 = true;
+
+public String[] getFlags();
+
+public boolean getFlag(String flag);
+
+public Object getParam(String key);
+
+public boolean getGenerate();
+
+public void setFlags(String[] flags);
+
+public void setFlag(String flag, boolean value);
+
+public void setGenerate(boolean value);
+
+public void setParam(String key, Object value);
+		
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIMethod.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIMethod.java
new file mode 100644
index 0000000000..ab41c6c68f
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIMethod.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tools.internal;
+
+public interface JNIMethod extends JNIItem {
+
+	public static final String[] FLAGS = {FLAG_NO_GEN, FLAG_ADDRESS, FLAG_CONST, FLAG_DYNAMIC, FLAG_JNI, FLAG_CAST, FLAG_CPP, FLAG_NEW, FLAG_DELETE, FLAG_GCNEW, FLAG_GCOBJECT, FLAG_SETTER, FLAG_GETTER, FLAG_ADDER};
+	
+public String getName();
+
+public int getModifiers();
+
+public boolean isNativeUnique();
+
+public JNIParameter[] getParameters();
+
+public JNIType getReturnType();
+
+public JNIType getReturnType64();
+
+public JNIType[] getParameterTypes();
+
+public JNIType[] getParameterTypes64();
+
+public JNIClass getDeclaringClass();
+
+public String getAccessor();
+
+public String getExclude();
+
+public void setAccessor(String str);
+
+public void setExclude(String str);
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIParameter.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIParameter.java
new file mode 100644
index 0000000000..364a7027e7
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIParameter.java
@@ -0,0 +1,20 @@
+package org.eclipse.swt.tools.internal;
+
+public interface JNIParameter extends JNIItem {
+
+	public static final String[] FLAGS = {FLAG_NO_IN, FLAG_NO_OUT, FLAG_CRITICAL, FLAG_INIT, FLAG_STRUCT, FLAG_UNICODE, FLAG_SENTINEL, FLAG_GCOBJECT};
+
+public String getCast();
+
+public JNIMethod getMethod();
+
+public int getParameter();
+
+public JNIClass getTypeClass();
+
+public JNIType getType();
+
+public JNIType getType64();
+
+public void setCast(String str);
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIType.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIType.java
new file mode 100644
index 0000000000..aad29811ef
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/JNIType.java
@@ -0,0 +1,27 @@
+package org.eclipse.swt.tools.internal;
+
+public interface JNIType {
+
+public boolean isPrimitive();
+
+public boolean isArray();
+
+public JNIType getComponentType();
+
+public boolean isType(String type);
+
+public String getName();
+
+public String getSimpleName();
+
+public String getTypeSignature(boolean define);
+
+public String getTypeSignature1(boolean define);
+
+public String getTypeSignature2(boolean define);
+
+public String getTypeSignature3(boolean define);
+
+public String getTypeSignature4(boolean define, boolean struct);
+
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/LockGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/LockGenerator.java
index 12c1162f80..11affd6276 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/LockGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/LockGenerator.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.swt.tools.internal;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Modifier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -19,8 +19,8 @@ public class LockGenerator extends CleanupClass {
 public LockGenerator() {
 }
 
-String getParams(Method method) {
-	int n_args = method.getParameterTypes().length;
+String getParams(JNIMethod method) {
+	int n_args = method.getParameters().length;
 	if (n_args == 0) return "";
 	String name = method.getName();
 	String params = "";
@@ -39,9 +39,9 @@ String getParams(Method method) {
 	return params;
 }
 
-String getReturn(Method method) {
-	Class returnType = method.getReturnType();
-	if (returnType != Integer.TYPE) return getTypeSignature3(returnType);
+String getReturn(JNIMethod method) {
+	JNIType returnType = method.getReturnType();
+	if (!returnType.isType("int")) return returnType.getTypeSignature3(false);
 	String modifierStr = Modifier.toString(method.getModifiers());
 	String name = method.getName();
 	Pattern p = Pattern.compile(modifierStr + ".*" + name + ".*(.*)");
@@ -50,28 +50,28 @@ String getReturn(Method method) {
 		String methodStr = classSource.substring(m.start(), m.end());
 		int index = methodStr.indexOf("/*long*/");
 		if (index != -1 && index < methodStr.indexOf(name)) {
-			return getTypeSignature3(Integer.TYPE) + " /*long*/";
+			return new ReflectType(Integer.TYPE).getTypeSignature3(false) + " /*long*/";
 		}		
 	}
-	return getTypeSignature3(Integer.TYPE);
+	return new ReflectType(Integer.TYPE).getTypeSignature3(false);
 }
 
-public void generate(Class clazz) {
+public void generate(JNIClass clazz) {
 	super.generate(clazz);
-	Method[] methods = clazz.getDeclaredMethods();
+	JNIMethod[] methods = clazz.getDeclaredMethods();
 	generate(methods);
 }
 
-public void generate(Method[] methods) {
+public void generate(JNIMethod[] methods) {
 	sort(methods);	
 	for (int i = 0; i < methods.length; i++) {
-		Method method = methods[i];
+		JNIMethod method = methods[i];
 		if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
 		generate(method);
 	}
 }
 
-public void generate(Method method) {
+public void generate(JNIMethod method) {
 	int modifiers = method.getModifiers();
 	boolean lock = (modifiers & Modifier.SYNCHRONIZED) != 0;
 	String returnStr = getReturn(method);
@@ -101,7 +101,7 @@ public void generate(Method method) {
 		outputln("\tlock.lock();");
 		outputln("\ttry {");
 		output("\t\t");
-		if (method.getReturnType() != Void.TYPE) {
+		if (!method.getReturnType().isType("void")) {
 			output("return ");
 		}
 		output("_");
@@ -133,7 +133,7 @@ public static void main(String[] args) {
 		String classSource = args[1]; 
 		Class clazz = Class.forName(clazzName);
 		gen.setClassSourcePath(classSource);
-		gen.generate(clazz);
+		gen.generate(new ReflectClass(clazz));
 	} catch (Exception e) {
 		System.out.println("Problem");
 		e.printStackTrace(System.out);
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MetaData.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MetaData.java
index d06e1fdc15..01d464b559 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MetaData.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MetaData.java
@@ -12,8 +12,6 @@ package org.eclipse.swt.tools.internal;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.Properties;
 
 public class MetaData {
@@ -48,162 +46,10 @@ public MetaData(Properties data) {
 	this.data = data;
 }
 
-public ClassData getMetaData(Class clazz) {
-	String key = JNIGenerator.toC(clazz.getName());
-	String value = getMetaData(key, "");
-	return new ClassData(clazz, value);
-}
-
-public FieldData getMetaData(Field field) {
-	String className = JNIGenerator.getClassName(field.getDeclaringClass());
-	String key = className + "_" + field.getName();
-	String value = getMetaData(key, "");
-	return new FieldData(field, value);
-}
-
-boolean convertTo32Bit(Class[] paramTypes, boolean floatingPointTypes) {
-	boolean changed = false;
-	for (int i = 0; i < paramTypes.length; i++) {
-		Class paramType = paramTypes[i];
-		if (paramType == Long.TYPE) {
-			paramTypes[i] = Integer.TYPE;
-			changed = true;
-		}
-		if (paramType == long[].class) {
-			paramTypes[i] = int[].class;
-			changed = true;
-		}
-		if (floatingPointTypes) {
-			if (paramType == Double.TYPE) {
-				paramTypes[i] = Float.TYPE;
-				changed = true;
-			}
-			if (paramType == double[].class) {
-				paramTypes[i] = float[].class;
-				changed = true;
-			}
-		}
-	}
-	return changed;	
-}
-
-public MethodData getMetaData(Method method) {
-	String className = JNIGenerator.getClassName(method.getDeclaringClass());
-	String key = className + "_" + JNIGenerator.getFunctionName(method);
-	String value = getMetaData(key, null);
-	if (value == null) {
-		key = className + "_" + method.getName();
-		value = getMetaData(key, null);
-	}
-	/*
-	* Support for 64 bit port.
-	*/
-	if (value == null) {
-		Class[] paramTypes = method.getParameterTypes();
-		if (convertTo32Bit(paramTypes, true)) {
-			key = className + "_" + JNIGenerator.getFunctionName(method, paramTypes);
-			value = getMetaData(key, null);
-		}
-		if (value == null) {
-			paramTypes = method.getParameterTypes();
-			if (convertTo32Bit(paramTypes, false)) {
-				key = className + "_" + JNIGenerator.getFunctionName(method, paramTypes);
-				value = getMetaData(key, null);
-			}
-		}
-	}
-	/*
-	* Support for lock.
-	*/
-	if (value == null && method.getName().startsWith("_")) {
-		key = className + "_" + JNIGenerator.getFunctionName(method).substring(2);
-		value = getMetaData(key, null);
-		if (value == null) {
-			key = className + "_" + method.getName().substring(1);
-			value = getMetaData(key, null);
-		}
-	}
-	if (value == null) value = "";	
-	return new MethodData(method, value);
-}
-
-public ParameterData getMetaData(Method method, int parameter) {
-	String className = JNIGenerator.getClassName(method.getDeclaringClass());
-	String key = className + "_" + JNIGenerator.getFunctionName(method) + "_" + parameter;
-	String value = getMetaData(key, null);
-	if (value == null) {
-		key = className + "_" + method.getName() + "_" + parameter;
-		value = getMetaData(key, null);
-	}
-	/*
-	* Support for 64 bit port.
-	*/
-	if (value == null) {
-		Class[] paramTypes = method.getParameterTypes();
-		if (convertTo32Bit(paramTypes, true)) {
-			key = className + "_" + JNIGenerator.getFunctionName(method, paramTypes) + "_" + parameter;
-			value = getMetaData(key, null);
-		}
-		if (value == null) {
-			paramTypes = method.getParameterTypes();
-			if (convertTo32Bit(paramTypes, false)) {
-				key = className + "_" + JNIGenerator.getFunctionName(method, paramTypes) + "_" + parameter;
-				value = getMetaData(key, null);
-			}
-		}
-	}
-	/*
-	* Support for lock.
-	*/
-	if (value == null && method.getName().startsWith("_")) {
-		key = className + "_" + JNIGenerator.getFunctionName(method).substring(2) + "_" + parameter;
-		value = getMetaData(key, null);
-		if (value == null) {
-			key = className + "_" + method.getName().substring(1) + "_" + parameter;
-			value = getMetaData(key, null);
-		}
-	}
-	if (value == null) value = "";	
-	return new ParameterData(method, parameter, value);
-}
-
 public String getMetaData(String key, String defaultValue) {
 	return data.getProperty(key, defaultValue);
 }
 
-public void setMetaData(Class clazz, ClassData value) {
-	String key = JNIGenerator.toC(clazz.getName());
-	setMetaData(key, value.toString());
-}
-
-public void setMetaData(Field field, FieldData value) {
-	String className = JNIGenerator.getClassName(field.getDeclaringClass());
-	String key = className + "_" + field.getName();
-	setMetaData(key, value.toString());
-}
-
-public void setMetaData(Method method, MethodData value) {
-	String key;
-	String className = JNIGenerator.getClassName(method.getDeclaringClass());
-	if (JNIGenerator.isNativeUnique(method)) {
-		key = className + "_" + method.getName ();
-	} else {
-		key = className + "_" + JNIGenerator.getFunctionName(method);
-	}
-	setMetaData(key, value.toString());
-}
-
-public void setMetaData(Method method, int arg, ParameterData value) {
-	String key;
-	String className = JNIGenerator.getClassName(method.getDeclaringClass());
-	if (JNIGenerator.isNativeUnique(method)) {
-		key = className + "_" + method.getName () + "_" + arg;
-	} else {
-		key = className + "_" + JNIGenerator.getFunctionName(method) + "_" + arg;
-	}
-	setMetaData(key, value.toString());
-}
-
 public void setMetaData(String key, String value) {
 	data.setProperty(key, value);
 }
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MetaDataGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MetaDataGenerator.java
index c7077df8b3..d90c66344e 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MetaDataGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MetaDataGenerator.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.swt.tools.internal;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Modifier;
 
 public class MetaDataGenerator extends JNIGenerator {
 
@@ -18,22 +18,21 @@ public void generateCopyright() {
 	generateMetaData("swt_properties_copyright");
 }
 
-public void generate(Class clazz) {
+public void generate(JNIClass clazz) {
 	output(toC(clazz.getName()));
 	output("=");
-	ClassData data = getMetaData().getMetaData(clazz);
-	if (data != null) output(data.toString());
+	output(((AbstractItem)clazz).flatten());
 	outputln();
-	Field[] fields = clazz.getDeclaredFields();
+	JNIField[] fields = clazz.getDeclaredFields();
 	generate(fields);
-	Method[] methods = clazz.getDeclaredMethods();
+	JNIMethod[] methods = clazz.getDeclaredMethods();
 	generate(methods);
 	outputln();
 }
 
-public void generate(Field[] fields) {
+public void generate(JNIField[] fields) {
 	for (int i = 0; i < fields.length; i++) {
-		Field field = fields[i];
+		JNIField field = fields[i];
 		int mods = field.getModifiers();
 		if ((mods & Modifier.PUBLIC) == 0) continue;
 		if ((mods & Modifier.FINAL) != 0) continue;
@@ -43,19 +42,18 @@ public void generate(Field[] fields) {
 	}
 }
 
-public void generate(Field field) {
-	output(getClassName(field.getDeclaringClass()));
+public void generate(JNIField field) {
+	output(field.getDeclaringClass().getSimpleName());
 	output("_");
 	output(field.getName());
 	output("=");
-	FieldData data = getMetaData().getMetaData(field);
-	if (data != null) output(data.toString());
+	output(((AbstractItem)field).flatten());
 }
 
-public void generate(Method[] methods) {
+public void generate(JNIMethod[] methods) {
 	sort(methods);
 	for (int i = 0; i < methods.length; i++) {
-		Method method = methods[i];
+		JNIMethod method = methods[i];
 		if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
 		generate(method);
 		outputln();
@@ -63,11 +61,11 @@ public void generate(Method[] methods) {
 	}
 }
 
-public void generate(Method method) {
+public void generate(JNIMethod method) {
 	StringBuffer buffer = new StringBuffer();
-	buffer.append(getClassName(method.getDeclaringClass()));
+	buffer.append(method.getDeclaringClass().getSimpleName());
 	buffer.append("_");
-	if (isNativeUnique(method)) {
+	if (method.isNativeUnique()) {
 		buffer.append(method.getName());
 	} else {
 		buffer.append(getFunctionName(method));
@@ -75,16 +73,14 @@ public void generate(Method method) {
 	String key = buffer.toString();
 	output(key);
 	output("=");
-	MethodData methodData = getMetaData().getMetaData(method);
-	if (methodData != null) output(methodData.toString());
+	output(((AbstractItem)method).flatten());
 	outputln();
-	int length = method.getParameterTypes().length;
-	for (int i = 0; i < length; i++) {
+	JNIParameter[] params = method.getParameters();
+	for (int i = 0; i < params.length; i++) {
 		output(key);
 		output("_");
 		output(i + "=");
-		ParameterData paramData = getMetaData().getMetaData(method, i);
-		if (paramData != null) output(paramData.toString());
+		output(((AbstractItem)params[i]).flatten());
 		outputln();		
 	}
 }
@@ -93,11 +89,15 @@ public String getExtension() {
 	return ".properties";
 }
 
+protected boolean getGenerate(JNIItem item) {
+	return true;
+}
+
 public String getOutputName() {
 	return getMainClass().getName();
 }
 
-protected boolean getGenerate(Class clazz) {
+protected boolean getGenerate(JNIClass clazz) {
 	return true;
 }
 
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MethodData.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MethodData.java
deleted file mode 100644
index cc2a1e978b..0000000000
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/MethodData.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.tools.internal;
-
-import java.lang.reflect.Method;
-
-public class MethodData extends ItemData {
-	
-	Method method;
-
-public MethodData(Method method, String str) {
-	super(str);
-	this.method = method;
-}
-
-public static String[] getAllFlags() {
-	return new String[]{FLAG_NO_GEN, FLAG_ADDRESS, FLAG_CONST, FLAG_DYNAMIC, FLAG_JNI, FLAG_CAST, FLAG_CPP, FLAG_NEW, FLAG_DELETE, FLAG_GCNEW, FLAG_GCOBJECT, FLAG_SETTER, FLAG_GETTER, FLAG_ADDER};
-}
-
-public Method getMethod() {
-	return method;
-}
-
-public String getAccessor() {
-	return (String)getParam("accessor");
-}
-
-public String getExclude() {
-	return (String)getParam("exclude");
-}
-
-public void setAccessor(String str) { 
-	setParam("accessor", str);
-}
-
-public void setExclude(String str) { 
-	setParam("exclude", str);
-}
-
-}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java
index 2a2179e238..2211b37efa 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.swt.tools.internal;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Modifier;
 import java.util.HashSet;
 import java.util.Iterator;
 
@@ -38,13 +38,13 @@ public void generateIncludes() {
 	outputln();
 }
 
-public void generate(Class clazz, String methodName) {
-	Method[] methods = clazz.getDeclaredMethods();
+public void generate(JNIClass clazz, String methodName) {
+	JNIMethod[] methods = clazz.getDeclaredMethods();
 	int count = 0;
 	for (int i = 0; i < methods.length; i++) {
 		if (methods[i].getName().startsWith(methodName)) count++;
 	}
-	Method[] result = new Method[count];
+	JNIMethod[] result = new JNIMethod[count];
 	count = 0;
 	for (int i = 0; i < methods.length; i++) {
 		if (methods[i].getName().startsWith(methodName)) result[count++] = methods[i];
@@ -52,11 +52,11 @@ public void generate(Class clazz, String methodName) {
 	generate(result);
 }
 
-public void generate(Class clazz) {
-	Method[] methods = clazz.getDeclaredMethods();
+public void generate(JNIClass clazz) {
+	JNIMethod[] methods = clazz.getDeclaredMethods();
 	int i = 0;
 	for (; i < methods.length; i++) {
-		Method method = methods[i];
+		JNIMethod method = methods[i];
 		if ((method.getModifiers() & Modifier.NATIVE) != 0) break;
 	}
 	if (i == methods.length) return;
@@ -66,37 +66,52 @@ public void generate(Class clazz) {
 	generate(methods);
 }
 
-public void generate(Method[] methods) {
+public void generate(JNIMethod[] methods) {
 	sort(methods);	
 	for (int i = 0; i < methods.length; i++) {
-		Method method = methods[i];
+		JNIMethod method = methods[i];
 		if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
 		generate(method);
 		if (progress != null) progress.step();
 	}
 }
 
-public void generate(Method method) {
-	MethodData methodData = getMetaData().getMetaData(method);
-	if (methodData.getFlag(FLAG_NO_GEN)) return;
-	Class returnType = method.getReturnType();
-	Class[] paramTypes = method.getParameterTypes();
-	String function = getFunctionName(method);
-	
-	if (!(returnType == Void.TYPE || returnType.isPrimitive() || isSystemClass(returnType) || returnType == String.class)) {
+public void generate(JNIMethod method) {
+	if (method.getFlag(FLAG_NO_GEN)) return;
+	JNIType returnType = method.getReturnType(), returnType64 = method.getReturnType64();	
+	if (!(returnType.isType("void") || returnType.isPrimitive() || isSystemClass(returnType) || returnType.isType("java.lang.String"))) {
 		output("Warning: bad return type. :");
 		outputln(method.toString());
 		return;
 	}
-	
-	generateSourceStart(function);
+	JNIParameter[] params = method.getParameters();
+	String function = getFunctionName(method), function64 = getFunctionName(method, method.getParameterTypes64());	
+	generateSourceStart(function, function64);
+	boolean sameFunction = function.equals(function64);
+	if (!sameFunction) {
+		output("#ifndef ");
+		output(JNI64);
+		outputln();
+	}
 	if (isCPP) {
 		output("extern \"C\" ");
-		generateFunctionPrototype(method, function, paramTypes, returnType, true);
+		generateFunctionPrototype(method, function, params, returnType, returnType64, true);
 		outputln(";");
 	}
-	generateFunctionPrototype(method, function, paramTypes, returnType, false);
-	generateFunctionBody(method, methodData, function, paramTypes, returnType);
+	generateFunctionPrototype(method, function, params, returnType, returnType64, !sameFunction);
+	if (!function.equals(function64)) {
+		outputln();
+		outputln("#else");
+		if (isCPP) {
+			output("extern \"C\" ");
+			generateFunctionPrototype(method, function64, params, returnType, returnType64, true);
+			outputln(";");
+		}
+		generateFunctionPrototype(method, function64, params, returnType, returnType64, !sameFunction);
+		outputln();
+		outputln("#endif");
+	}
+	generateFunctionBody(method, function, function64, params, returnType, returnType64);
 	generateSourceEnd(function);
 	outputln();
 }
@@ -105,13 +120,12 @@ public void setEnterExitMacro(boolean enterExitMacro) {
 	this.enterExitMacro = enterExitMacro;
 }
 
-void generateExcludes(Method[] methods) {
+void generateExcludes(JNIMethod[] methods) {
 	HashSet excludes = new HashSet();
 	for (int i = 0; i < methods.length; i++) {
-		Method method = methods[i];
+		JNIMethod method = methods[i];
 		if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
-		MethodData methodData = getMetaData().getMetaData(method);
-		String exclude = methodData.getExclude();
+		String exclude = method.getExclude();
 		if (exclude.length() != 0) {
 			excludes.add(exclude);
 		}
@@ -120,10 +134,9 @@ void generateExcludes(Method[] methods) {
 		String exclude = (String)iter.next();
 		outputln(exclude);
 		for (int i = 0; i < methods.length; i++) {
-			Method method = methods[i];
+			JNIMethod method = methods[i];
 			if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
-			MethodData methodData = getMetaData().getMetaData(method);
-			String methodExclude = methodData.getExclude();
+			String methodExclude = method.getExclude();
 			if (exclude.equals(methodExclude)) {
 				output("#define NO_");
 				outputln(getFunctionName(method));
@@ -134,18 +147,19 @@ void generateExcludes(Method[] methods) {
 	}
 }
 
-void generateNativeMacro(Class clazz) {
+void generateNativeMacro(JNIClass clazz) {
 	output("#define ");
-	output(getClassName(clazz));
+	output(clazz.getSimpleName());
 	output("_NATIVE(func) Java_");
 	output(toC(clazz.getName()));
 	outputln("_##func");
 	outputln();
 }
 
-boolean generateGetParameter(Method method, int i, Class paramType, ParameterData paramData, boolean critical, int indent) {
+boolean generateGetParameter(JNIMethod method, JNIParameter param, boolean critical, int indent) {
+	JNIType paramType = param.getType(), paramType64 = param.getType64();
 	if (paramType.isPrimitive() || isSystemClass(paramType)) return false;
-	String iStr = String.valueOf(i);
+	String iStr = String.valueOf(param.getParameter());
 	for (int j = 0; j < indent; j++) output("\t");
 	output("if (arg");
 	output(iStr);
@@ -153,12 +167,12 @@ boolean generateGetParameter(Method method, int i, Class paramType, ParameterDat
 	output(iStr);
 	output(" = ");
 	if (paramType.isArray()) {
-		Class componentType = paramType.getComponentType();
+		JNIType componentType = paramType.getComponentType();
 		if (componentType.isPrimitive()) {
 			if (critical) {
 				if (isCPP) {
 					output("(");
-					output(getTypeSignature2(componentType));
+					output(componentType.getTypeSignature2(!paramType.equals(paramType64)));
 					output("*)");
 					output("env->GetPrimitiveArrayCritical(arg");
 				} else {
@@ -172,7 +186,7 @@ boolean generateGetParameter(Method method, int i, Class paramType, ParameterDat
 				} else {
 					output("(*env)->Get");
 				}
-				output(getTypeSignature1(componentType));
+				output(componentType.getTypeSignature1(!paramType.equals(paramType64)));
 				if (isCPP) {
 					output("ArrayElements(arg");
 				} else {
@@ -184,8 +198,8 @@ boolean generateGetParameter(Method method, int i, Class paramType, ParameterDat
 		} else {
 			throw new Error("not done");
 		}
-	} else if (paramType == String.class) {
-		if (paramData.getFlag(FLAG_UNICODE)) {
+	} else if (paramType.isType("java.lang.String")) {
+		if (param.getFlag(FLAG_UNICODE)) {
 			if (isCPP) {
 				output("env->GetStringChars(arg");
 			} else {
@@ -203,12 +217,12 @@ boolean generateGetParameter(Method method, int i, Class paramType, ParameterDat
 			output(", NULL)");
 		}
 	} else {
-		if (paramData.getFlag(FLAG_NO_IN)) {
+		if (param.getFlag(FLAG_NO_IN)) {
 			output("&_arg");
 			output(iStr);
 		} else {
 			output("get");
-			output(getClassName(paramType));
+			output(paramType.getSimpleName());
 			output("Fields(env, arg");
 			output(iStr);
 			output(", &_arg");
@@ -220,16 +234,17 @@ boolean generateGetParameter(Method method, int i, Class paramType, ParameterDat
 	return true;
 }
 
-void generateSetParameter(int i, Class paramType, ParameterData paramData, boolean critical) {
+void generateSetParameter(JNIParameter param, boolean critical) {
+	JNIType paramType = param.getType(), paramType64 = param.getType64();
 	if (paramType.isPrimitive() || isSystemClass(paramType)) return;
-	String iStr = String.valueOf(i);
+	String iStr = String.valueOf(param.getParameter());
 	if (paramType.isArray()) {
 		output("\tif (arg");
 		output(iStr);
 		output(" && lparg");
 		output(iStr);
 		output(") ");
-		Class componentType = paramType.getComponentType();
+		JNIType componentType = paramType.getComponentType();
 		if (componentType.isPrimitive()) {
 			if (critical) {
 				if (isCPP) {
@@ -244,7 +259,7 @@ void generateSetParameter(int i, Class paramType, ParameterData paramData, boole
 				} else {
 					output("(*env)->Release");
 				}
-				output(getTypeSignature1(componentType));
+				output(componentType.getTypeSignature1(!paramType.equals(paramType64)));
 				if (isCPP) {
 					output("ArrayElements(arg");
 				} else {
@@ -255,7 +270,7 @@ void generateSetParameter(int i, Class paramType, ParameterData paramData, boole
 			output(", lparg");
 			output(iStr);
 			output(", ");
-			if (paramData.getFlag(FLAG_NO_OUT)) {
+			if (param.getFlag(FLAG_NO_OUT)) {
 				output("JNI_ABORT");
 			} else {				
 				output("0");
@@ -265,13 +280,13 @@ void generateSetParameter(int i, Class paramType, ParameterData paramData, boole
 			throw new Error("not done");
 		}
 		outputln();
-	} else if (paramType == String.class) {
+	} else if (paramType.isType("java.lang.String")) {
 		output("\tif (arg");
 		output(iStr);
 		output(" && lparg");
 		output(iStr);
 		output(") ");
-		if (paramData.getFlag(FLAG_UNICODE)) {
+		if (param.getFlag(FLAG_UNICODE)) {
 			if (isCPP) {
 				output("env->ReleaseStringChars(arg");
 			} else {
@@ -289,14 +304,14 @@ void generateSetParameter(int i, Class paramType, ParameterData paramData, boole
 		output(iStr);
 		outputln(");");
 	} else {
-		if (!paramData.getFlag(FLAG_NO_OUT)) {
+		if (!param.getFlag(FLAG_NO_OUT)) {
 			output("\tif (arg");
 			output(iStr);
 			output(" && lparg");
 			output(iStr);
 			output(") ");
 			output("set");
-			output(getClassName(paramType));
+			output(paramType.getSimpleName());
 			output("Fields(env, arg");
 			output(iStr);
 			output(", lparg");
@@ -306,55 +321,63 @@ void generateSetParameter(int i, Class paramType, ParameterData paramData, boole
 	}
 }
 
-void generateExitMacro(Method method, String function) {
-	if (!enterExitMacro) return;
-	output("\t");
-	output(getClassName(method.getDeclaringClass()));
-	output("_NATIVE_EXIT(env, that, ");
-	output(function);
-	outputln("_FUNC);");
-}
-
-void generateEnterMacro(Method method, String function) {
+void generateEnterExitMacro(JNIMethod method, String function, String function64, boolean enter) {
 	if (!enterExitMacro) return;
+	if (!function.equals(function64)) {
+		output("#ifndef ");
+		output(JNI64);
+		outputln();
+	}
 	output("\t");
-	output(getClassName(method.getDeclaringClass()));
-	output("_NATIVE_ENTER(env, that, ");
+	output(method.getDeclaringClass().getSimpleName());
+	output("_NATIVE_");
+	output(enter ? "ENTER" : "EXIT");
+	output("(env, that, ");
 	output(function);
 	outputln("_FUNC);");
+	if (!function.equals(function64)) {
+		outputln("#else");
+		output("\t");
+		output(method.getDeclaringClass().getSimpleName());
+		output("_NATIVE_");
+		output(enter ? "ENTER" : "EXIT");
+		output("(env, that, ");
+		output(function64);
+		outputln("_FUNC);");
+		outputln("#endif");
+	}
 }
 
-boolean generateLocalVars(Method method, Class[] paramTypes, Class returnType) {
+boolean generateLocalVars(JNIMethod method, JNIParameter[] params, JNIType returnType, JNIType returnType64) {
 	boolean needsReturn = enterExitMacro;
-	for (int i = 0; i < paramTypes.length; i++) {
-		Class paramType = paramTypes[i];
+	for (int i = 0; i < params.length; i++) {
+		JNIParameter param = params[i];
+		JNIType paramType = param.getType(), paramType64 = param.getType64();
 		if (paramType.isPrimitive() || isSystemClass(paramType)) continue;
-		ParameterData paramData = getMetaData().getMetaData(method, i);
 		output("\t");
 		if (paramType.isArray()) {
-			Class componentType = paramType.getComponentType();
+			JNIType componentType = paramType.getComponentType();
 			if (componentType.isPrimitive()) {
-				output(getTypeSignature2(componentType));
+				output(componentType.getTypeSignature2(!paramType.equals(paramType64)));
 				output(" *lparg" + i);
 				output("=NULL;");
 			} else {
 				throw new Error("not done");
 			}
-		} else if (paramType == String.class) {
-			if (paramData.getFlag(FLAG_UNICODE)) {
+		} else if (paramType.isType("java.lang.String")) {
+			if (param.getFlag(FLAG_UNICODE)) {
 				output("const jchar *lparg" + i);				
 			} else {
 				output("const char *lparg" + i);
 			}
 			output("= NULL;");
 		} else {
-			ClassData classData = metaData.getMetaData(paramType);
-			if (classData.getFlag(Flags.FLAG_STRUCT)) {
+			if (param.getTypeClass().getFlag(Flags.FLAG_STRUCT)) {
 				output("struct ");
 			}
-			output(getClassName(paramType));
+			output(paramType.getSimpleName());
 			output(" _arg" + i);
-			if (paramData.getFlag(FLAG_INIT)) output("={0}");
+			if (param.getFlag(FLAG_INIT)) output("={0}");
 			output(", *lparg" + i);
 			output("=NULL;");
 		}
@@ -362,23 +385,22 @@ boolean generateLocalVars(Method method, Class[] paramTypes, Class returnType) {
 		needsReturn = true;
 	}
 	if (needsReturn) {
-		if (returnType != Void.TYPE) {
+		if (!returnType.isType("void")) {
 			output("\t");
-			output(getTypeSignature2(returnType));
+			output(returnType.getTypeSignature2(!returnType.equals(returnType64)));
 			outputln(" rc = 0;");
 		}
 	}
 	return needsReturn;
 }
 
-boolean generateGetters(Method method, Class[] paramTypes) {
+boolean generateGetters(JNIMethod method, JNIParameter[] params) {
 	boolean genFailTag = false;
 	int criticalCount = 0;
-	for (int i = 0; i < paramTypes.length; i++) {
-		Class paramType = paramTypes[i];
-		ParameterData paramData = getMetaData().getMetaData(method, i);
-		if (!isCritical(paramType, paramData)) {
-			genFailTag |= generateGetParameter(method, i, paramType, paramData, false, 1);
+	for (int i = 0; i < params.length; i++) {
+		JNIParameter param = params[i];
+		if (!isCritical(param)) {
+			genFailTag |= generateGetParameter(method, param, false, 1);
 		} else {
 			criticalCount++;
 		}
@@ -386,21 +408,19 @@ boolean generateGetters(Method method, Class[] paramTypes) {
 	if (criticalCount != 0) {
 		outputln("#ifdef JNI_VERSION_1_2");
 		outputln("\tif (IS_JNI_1_2) {");
-		for (int i = 0; i < paramTypes.length; i++) {
-			Class paramType = paramTypes[i];
-			ParameterData paramData = getMetaData().getMetaData(method, i);
-			if (isCritical(paramType, paramData)) {
-				genFailTag |= generateGetParameter(method, i, paramType, paramData, true, 2);
+		for (int i = 0; i < params.length; i++) {
+			JNIParameter param = params[i];
+			if (isCritical(param)) {
+				genFailTag |= generateGetParameter(method, param, true, 2);
 			}
 		}
 		outputln("\t} else");
 		outputln("#endif");
 		outputln("\t{");
-		for (int i = 0; i < paramTypes.length; i++) {
-			Class paramType = paramTypes[i];
-			ParameterData paramData = getMetaData().getMetaData(method, i);
-			if (isCritical(paramType, paramData)) {
-				genFailTag |= generateGetParameter(method, i, paramType, paramData, false, 2);
+		for (int i = 0; i < params.length; i++) {
+			JNIParameter param = params[i];
+			if (isCritical(param)) {
+				genFailTag |= generateGetParameter(method, param, false, 2);
 			}
 		}
 		outputln("\t}");
@@ -408,215 +428,128 @@ boolean generateGetters(Method method, Class[] paramTypes) {
 	return genFailTag;
 }
 
-void generateSetters(Method method, Class[] paramTypes) {
+void generateSetters(JNIMethod method, JNIParameter[] params) {
 	int criticalCount = 0;
-	for (int i = paramTypes.length - 1; i >= 0; i--) {
-		Class paramType = paramTypes[i];
-		ParameterData paramData = getMetaData().getMetaData(method, i);
-		if (isCritical(paramType, paramData)) {
+	for (int i = params.length - 1; i >= 0; i--) {
+		JNIParameter param = params[i];
+		if (isCritical(param)) {
 			criticalCount++;
 		}
 	}
 	if (criticalCount != 0) {
 		outputln("#ifdef JNI_VERSION_1_2");
 		outputln("\tif (IS_JNI_1_2) {");
-		for (int i = paramTypes.length - 1; i >= 0; i--) {
-			Class paramType = paramTypes[i];
-			ParameterData paramData = getMetaData().getMetaData(method, i);
-			if (isCritical(paramType, paramData)) {
+		for (int i = params.length - 1; i >= 0; i--) {
+			JNIParameter param = params[i];
+			if (isCritical(param)) {
 				output("\t");
-				generateSetParameter(i, paramType, paramData, true);
+				generateSetParameter(param, true);
 			}
 		}
 		outputln("\t} else");
 		outputln("#endif");
 		outputln("\t{");
-		for (int i = paramTypes.length - 1; i >= 0; i--) {
-			Class paramType = paramTypes[i];
-			ParameterData paramData = getMetaData().getMetaData(method, i);
-			if (isCritical(paramType, paramData)) {
+		for (int i = params.length - 1; i >= 0; i--) {
+			JNIParameter param = params[i];
+			if (isCritical(param)) {
 				output("\t");
-				generateSetParameter(i, paramType, paramData, false);
+				generateSetParameter(param, false);
 			}
 		}
 		outputln("\t}");
 	}
-	for (int i = paramTypes.length - 1; i >= 0; i--) {
-		Class paramType = paramTypes[i];
-		ParameterData paramData = getMetaData().getMetaData(method, i);
-		if (!isCritical(paramType, paramData)) {
-			generateSetParameter(i, paramType, paramData, false);
+	for (int i = params.length - 1; i >= 0; i--) {
+		JNIParameter param = params[i];
+		if (!isCritical(param)) {
+			generateSetParameter(param, false);
 		}
 	}
 }
 
-void generateDynamicFunctionCall(Method method, MethodData methodData, Class[] paramTypes, Class returnType, boolean needsReturn) {
+void generateDynamicFunctionCall(JNIMethod method, JNIParameter[] params, JNIType returnType, JNIType returnType64, boolean needsReturn) {
 	outputln("/*");
-	generateFunctionCall(method, methodData, paramTypes, returnType, needsReturn);
+	generateFunctionCall(method, params, returnType, returnType64, needsReturn);
 	outputln("*/");
 	outputln("\t{");
 
 	String name = method.getName();
 	if (name.startsWith("_")) name = name.substring(1);
-	if (getPlatform().equals("win32")) {
-		outputln("\t\tstatic int initialized = 0;");
-		outputln("\t\tstatic HMODULE hm = NULL;");
-		outputln("\t\tstatic FARPROC fp = NULL;");
-		if (returnType != Void.TYPE) {
-			if (needsReturn) {
-				outputln("\t\trc = 0;");
-			}
-		}
-		outputln("\t\tif (!initialized) {");
-		output("\t\t\tif (!hm) hm = LoadLibrary(");
-		output(name);
-		outputln("_LIB);");
-		output("\t\t\tif (hm) fp = GetProcAddress(hm, \"");
-		output(name);
-		outputln("\");");
-		outputln("\t\t\tinitialized = 1;");
-		outputln("\t\t}");
-		outputln("\t\tif (fp) {");
-		output("\t\t");
-		generateFunctionCallLeftSide(method, methodData, returnType, needsReturn);
-		output("fp");
-		generateFunctionCallRightSide(method, methodData, paramTypes, 0);
-		output(";");
-		outputln();
-		outputln("\t\t}");
-	} else if (getPlatform().equals("carbon") || getPlatform().equals("cocoa")) {
-		outputln("\t\tstatic int initialized = 0;");
-		outputln("\t\tstatic CFBundleRef bundle = NULL;");
-		output("\t\ttypedef ");
-		output(getTypeSignature2(returnType));
-		output(" (*FPTR)(");
-		for (int i = 0; i < paramTypes.length; i++) {
-			if (i != 0) output(", ");
-			Class paramType = paramTypes[i];
-			ParameterData paramData = getMetaData().getMetaData(method, i);
-			String cast = paramData.getCast();
-			if (cast.length() > 2) {
-				output(cast.substring(1, cast.length() - 1));
-			} else {
-				output(getTypeSignature4(paramType, paramData.getFlag(FLAG_STRUCT)));
-			}
-		}
-		outputln(");");
-		outputln("\t\tstatic FPTR fptr;");
-		if (returnType != Void.TYPE) {
-			if (needsReturn) {
-				outputln("\t\trc = 0;");
-			}
-		}
-		outputln("\t\tif (!initialized) {");
-		output("\t\t\tif (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(");
-		output(name);
-		outputln("_LIB));");
-		output("\t\t\tif (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR(\"");
-		output(name);
-		outputln("\"));");
-		outputln("\t\t\tinitialized = 1;");
-		outputln("\t\t}");
-		outputln("\t\tif (fptr) {");
-		output("\t\t");
-		generateFunctionCallLeftSide(method, methodData, returnType, needsReturn);
-		output("(*fptr)");
-		generateFunctionCallRightSide(method, methodData, paramTypes, 0);
-		output(";");
-		outputln();
-		outputln("\t\t}");
-	} else {
-		outputln("\t\tstatic int initialized = 0;");
-		outputln("\t\tstatic void *handle = NULL;");
-		output("\t\ttypedef ");
-		output(getTypeSignature2(returnType));
-		output(" (*FPTR)(");
-		for (int i = 0; i < paramTypes.length; i++) {
-			if (i != 0) output(", ");
-			Class paramType = paramTypes[i];
-			ParameterData paramData = getMetaData().getMetaData(method, i);
-			String cast = paramData.getCast();
-			if (cast.length() > 2) {
-				output(cast.substring(1, cast.length() - 1));
-			} else {
-				output(getTypeSignature4(paramType, paramData.getFlag(FLAG_STRUCT)));
-			}
-		}
-		outputln(");");
-		outputln("\t\tstatic FPTR fptr;");
-		if (returnType != Void.TYPE) {
-			if (needsReturn) {
-				outputln("\t\trc = 0;");
-			}
+	output("\t\tLOAD_FUNCTION(fp, ");
+	output(name);
+	outputln(")");
+	outputln("\t\tif (fp) {");
+	output("\t\t");
+	generateFunctionCallLeftSide(method, returnType, returnType64, needsReturn);
+	output("((");
+	output(returnType.getTypeSignature2(!returnType.equals(returnType64)));
+	output(" (CALLING_CONVENTION*)(");
+	for (int i = 0; i < params.length; i++) {
+		if (i != 0) output(", ");
+		JNIParameter param = params[i];
+		String cast = param.getCast();
+		if (cast.length() > 2) {
+			output(cast.substring(1, cast.length() - 1));
+		} else {
+			JNIType paramType = param.getType(), paramType64 = param.getType64();
+			output(paramType.getTypeSignature4(!paramType.equals(paramType64), param.getFlag(FLAG_STRUCT)));
 		}
-		outputln("\t\tif (!initialized) {");
-		output("\t\t\tif (!handle) handle = dlopen(");
-		output(name);
-		outputln("_LIB, RTLD_LAZY);");
-		output("\t\t\tif (handle) fptr = (FPTR)dlsym(handle, \"");
-		output(name);
-		outputln("\");");
-		outputln("\t\t\tinitialized = 1;");
-		outputln("\t\t}");
-		outputln("\t\tif (fptr) {");
-		output("\t\t");
-		generateFunctionCallLeftSide(method, methodData, returnType, needsReturn);
-		output("(*fptr)");
-		generateFunctionCallRightSide(method, methodData, paramTypes, 0);
-		output(";");
-		outputln();
-		outputln("\t\t}");
 	}
-
+	output("))");
+	output("fp");
+	output(")");
+	generateFunctionCallRightSide(method, params, 0);
+	output(";");
+	outputln();
+	outputln("\t\t}");
 	outputln("\t}");
 }
 
-void generateFunctionCallLeftSide(Method method, MethodData methodData, Class returnType, boolean needsReturn) {
+void generateFunctionCallLeftSide(JNIMethod method, JNIType returnType, JNIType returnType64, boolean needsReturn) {
 	output("\t");
-	if (returnType != Void.TYPE) {
+	if (!returnType.isType("void")) {
 		if (needsReturn) {
 			output("rc = ");
 		} else {
 			output("return ");
 		}
 		output("(");
-		output(getTypeSignature2(returnType));
+		output(returnType.getTypeSignature2(!returnType.equals(returnType64)));
 		output(")");
 	}
-	if (methodData.getFlag(FLAG_ADDRESS)) {
+	if (method.getFlag(FLAG_ADDRESS)) {
 		output("&");
 	}	
-	if (methodData.getFlag(FLAG_JNI)) {
+	if (method.getFlag(FLAG_JNI)) {
 		output(isCPP ? "env->" : "(*env)->");
 	}
 }
 
-void generateFunctionCallRightSide(Method method, MethodData methodData, Class[] paramTypes, int paramStart) {
-	if (!methodData.getFlag(FLAG_CONST)) {
+void generateFunctionCallRightSide(JNIMethod method, JNIParameter[] params, int paramStart) {
+	if (!method.getFlag(FLAG_CONST)) {
 		output("(");
-		if (methodData.getFlag(FLAG_JNI)) {
+		if (method.getFlag(FLAG_JNI)) {
 			if (!isCPP) output("env, ");
 		}
-		for (int i = paramStart; i < paramTypes.length; i++) {
-			Class paramType = paramTypes[i];
-			ParameterData paramData = getMetaData().getMetaData(method, i);
+		for (int i = paramStart; i < params.length; i++) {
+			JNIParameter param = params[i];
 			if (i != paramStart) output(", ");
-			if (paramData.getFlag(FLAG_STRUCT)) output("*");
-			output(paramData.getCast());
-			if (paramData.getFlag(FLAG_GCOBJECT)) output("TO_OBJECT(");
-			if (i == paramTypes.length - 1 && paramData.getFlag(FLAG_SENTINEL)) {
+			if (param.getFlag(FLAG_STRUCT)) output("*");
+			output(param.getCast());
+			if (param.getFlag(FLAG_GCOBJECT)) output("TO_OBJECT(");
+			if (i == params.length - 1 && param.getFlag(FLAG_SENTINEL)) {
 				output("NULL");
 			} else {
+				JNIType paramType = param.getType();
 				if (!paramType.isPrimitive() && !isSystemClass(paramType)) output("lp");
 				output("arg" + i);
 			}
-			if (paramData.getFlag(FLAG_GCOBJECT)) output(")");
+			if (param.getFlag(FLAG_GCOBJECT)) output(")");
 		}
 		output(")");
 	}
 }
 
-void generateFunctionCall(Method method, MethodData methodData, Class[] paramTypes, Class returnType, boolean needsReturn) {
+void generateFunctionCall(JNIMethod method, JNIParameter[] params, JNIType returnType, JNIType returnType64, boolean needsReturn) {
 	String name = method.getName();
 	boolean objc_struct = false;
 	if (name.equals("objc_msgSend_stret")) {
@@ -624,63 +557,64 @@ void generateFunctionCall(Method method, MethodData methodData, Class[] paramTyp
 		outputln("\tif (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {");
 		output("\t");
 	}
-	String copy = (String)methodData.getParam("copy");
-	boolean makeCopy = copy.length() != 0 && isCPP && returnType != Void.TYPE;
+	String copy = (String)method.getParam("copy");
+	boolean makeCopy = copy.length() != 0 && isCPP && !returnType.isType("void");
 	if (makeCopy) {
 		output("\t");
 		output(copy);
 		output(" temp = ");
 	} else {
-		generateFunctionCallLeftSide(method, methodData, returnType, needsReturn);
+		generateFunctionCallLeftSide(method, returnType, returnType64, needsReturn);
 	}
 	int paramStart = 0;
 	if (name.startsWith("_")) name = name.substring(1);
 	if (name.equalsIgnoreCase("call")) {
 		output("(");
-		ParameterData paramData = getMetaData().getMetaData(method, 0);
-		String cast = paramData.getCast(); 
+		String cast = params[0].getCast(); 
 		if (cast.length() != 0 && !cast.equals("()")) {
 			output(cast);
 		} else {
 			output("(");
-			output(getTypeSignature2(returnType));
+			output(returnType.getTypeSignature2(!returnType.equals(returnType64)));
 			output(" (*)())");
 		}
 		output("arg0)");
 		paramStart = 1;
 	} else if (name.startsWith("VtblCall")) {
 		output("((");
-		output(getTypeSignature2(returnType));
+		output(returnType.getTypeSignature2(!returnType.equals(returnType64)));
 		output(" (STDMETHODCALLTYPE *)(");
-		for (int i = 1; i < paramTypes.length; i++) {
+		for (int i = 1; i < params.length; i++) {
 			if (i != 1) output(", ");
-			Class paramType = paramTypes[i];
-			output(getTypeSignature4(paramType));
+			JNIParameter param = params[i];
+			JNIType paramType = param.getType(), paramType64 = param.getType64();
+			output(paramType.getTypeSignature4(!paramType.equals(paramType64), false));
 		}
 		output("))(*(");
-		output(getTypeSignature4(paramTypes[1]));
+		JNIType paramType = params[1].getType(), paramType64 = params[1].getType64();
+		output(paramType.getTypeSignature4(!paramType.equals(paramType64), false));
 		output(" **)arg1)[arg0])");
 		paramStart = 1;
-	} else if (methodData.getFlag(FLAG_CPP) || methodData.getFlag(FLAG_SETTER) || methodData.getFlag(FLAG_GETTER) || methodData.getFlag(FLAG_ADDER)) {
-		if (methodData.getFlag(FLAG_GCOBJECT)) {
+	} else if (method.getFlag(FLAG_CPP) || method.getFlag(FLAG_SETTER) || method.getFlag(FLAG_GETTER) || method.getFlag(FLAG_ADDER)) {
+		if (method.getFlag(FLAG_GCOBJECT)) {
 			output("TO_HANDLE(");
 		}
 		output("(");
-		ParameterData paramData = getMetaData().getMetaData(method, 0);
-		if (paramData.getFlag(FLAG_STRUCT)) output("*");
-		String cast = paramData.getCast(); 
+		JNIParameter param = params[0];
+		if (param.getFlag(FLAG_STRUCT)) output("*");
+		String cast = param.getCast(); 
 		if (cast.length() != 0 && !cast.equals("()")) {
 			output(cast);
 		}
-		if (paramData.getFlag(FLAG_GCOBJECT)) {
+		if (param.getFlag(FLAG_GCOBJECT)) {
 			output("TO_OBJECT(");
 		}
 		output("arg0");
-		if (paramData.getFlag(FLAG_GCOBJECT)) {
+		if (param.getFlag(FLAG_GCOBJECT)) {
 			output(")");
 		}
 		output(")->");
-		String accessor = methodData.getAccessor();
+		String accessor = method.getAccessor();
 		if (accessor.length() != 0) {
 			output(accessor);
 		} else {
@@ -692,9 +626,9 @@ void generateFunctionCall(Method method, MethodData methodData, Class[] paramTyp
 			}
 		}
 		paramStart = 1;
-	} else if (methodData.getFlag(FLAG_GCNEW)) {
+	} else if (method.getFlag(FLAG_GCNEW)) {
 		output("TO_HANDLE(gcnew ");
-		String accessor = methodData.getAccessor();
+		String accessor = method.getAccessor();
 		if (accessor.length() != 0) {
 			output(accessor);
 		} else {
@@ -705,9 +639,9 @@ void generateFunctionCall(Method method, MethodData methodData, Class[] paramTyp
 				output(name);
 			}
 		}
-	} else if (methodData.getFlag(FLAG_NEW)) {
+	} else if (method.getFlag(FLAG_NEW)) {
 		output("new ");
-		String accessor = methodData.getAccessor();
+		String accessor = method.getAccessor();
 		if (accessor.length() != 0) {
 			output(accessor);
 		} else {
@@ -718,10 +652,10 @@ void generateFunctionCall(Method method, MethodData methodData, Class[] paramTyp
 				output(name);
 			}
 		}
-	} else if (methodData.getFlag(FLAG_DELETE)) {
+	} else if (method.getFlag(FLAG_DELETE)) {
 		output("delete ");
-		ParameterData paramData = getMetaData().getMetaData(method, 0);
-		String cast = paramData.getCast(); 
+		JNIParameter param = params[0];
+		String cast = param.getCast(); 
 		if (cast.length() != 0 && !cast.equals("()")) {
 			output(cast);
 		} else {
@@ -732,48 +666,53 @@ void generateFunctionCall(Method method, MethodData methodData, Class[] paramTyp
 		outputln("arg0;");
 		return;
 	} else {
-		if (methodData.getFlag(FLAG_GCOBJECT)) {
+		if (method.getFlag(FLAG_GCOBJECT)) {
 			output("TO_HANDLE(");				
 		}
-		if (methodData.getFlag(Flags.FLAG_CAST)) {
+		if (method.getFlag(Flags.FLAG_CAST)) {
 			output("((");
-			output(getTypeSignature2(returnType));
+			output(returnType.getTypeSignature2(!returnType.equals(returnType64)));
 			output(" (*)(");
-			for (int i = 0; i < paramTypes.length; i++) {
+			for (int i = 0; i < params.length; i++) {
 				if (i != 0) output(", ");
-				Class paramType = paramTypes[i];
-				ParameterData paramData = getMetaData().getMetaData(method, i);
-				String cast = paramData.getCast();
+				JNIParameter param = params[i];
+				String cast = param.getCast();
 				if (cast != null && cast.length() != 0) {
 					if (cast.startsWith("(")) cast = cast.substring(1);
 					if (cast.endsWith(")")) cast = cast.substring(0, cast.length() - 1);
 					output(cast);
 				} else {
-					output(getTypeSignature4(paramType, paramData.getFlag(FLAG_STRUCT)));
+					JNIType paramType = param.getType(), paramType64 = param.getType64();
+					if (!(paramType.isPrimitive() || paramType.isArray())) {
+						if (param.getTypeClass().getFlag(FLAG_STRUCT)) {
+							output("struct ");
+						}
+					}
+					output(paramType.getTypeSignature4(!paramType.equals(paramType64), param.getFlag(FLAG_STRUCT)));
 				}
 			}
 			output("))");
 		}
-		String accessor = methodData.getAccessor();
+		String accessor = method.getAccessor();
 		if (accessor.length() != 0) {
 			output(accessor);
 		} else {
 			output(name);
 		}
-		if (methodData.getFlag(Flags.FLAG_CAST)) {
+		if (method.getFlag(Flags.FLAG_CAST)) {
 			output(")");
 		}
 	}
-	if ((methodData.getFlag(FLAG_SETTER) && paramTypes.length == 3) || (methodData.getFlag(FLAG_GETTER) && paramTypes.length == 2)) {
+	if ((method.getFlag(FLAG_SETTER) && params.length == 3) || (method.getFlag(FLAG_GETTER) && params.length == 2)) {
 		output("[arg1]");
 		paramStart++;
 	}
-	if (methodData.getFlag(FLAG_SETTER)) output(" = ");
-	if (methodData.getFlag(FLAG_ADDER)) output(" += ");
-	if (!methodData.getFlag(FLAG_GETTER)) {
-		generateFunctionCallRightSide(method, methodData, paramTypes, paramStart);
+	if (method.getFlag(FLAG_SETTER)) output(" = ");
+	if (method.getFlag(FLAG_ADDER)) output(" += ");
+	if (!method.getFlag(FLAG_GETTER)) {
+		generateFunctionCallRightSide(method, params, paramStart);
 	}
-	if (methodData.getFlag(FLAG_GCNEW) || methodData.getFlag(FLAG_GCOBJECT)) {
+	if (method.getFlag(FLAG_GCNEW) || method.getFlag(FLAG_GCOBJECT)) {
 		output(")");
 	}
 	output(";");
@@ -788,7 +727,7 @@ void generateFunctionCall(Method method, MethodData methodData, Class[] paramTyp
 		outputln("\t\t*copy = temp;");
 		output("\t\trc = ");
 		output("(");
-		output(getTypeSignature2(returnType));
+		output(returnType.getTypeSignature2(!returnType.equals(returnType64)));
 		output(")");
 		outputln("copy;");
 		outputln("\t}");
@@ -796,80 +735,81 @@ void generateFunctionCall(Method method, MethodData methodData, Class[] paramTyp
 	if (objc_struct) {
 		outputln("\t} else {");
 		output("\t\t*lparg0 = (*(");
-		output(getTypeSignature4(paramTypes[0], true));
+		JNIType paramType = params[0].getType(), paramType64 = params[0].getType64();
+		output(paramType.getTypeSignature4(!paramType.equals(paramType64), true));
 		output(" (*)(");
-		for (int i = 1; i < paramTypes.length; i++) {
+		for (int i = 1; i < params.length; i++) {
 			if (i != 1) output(", ");
-			Class paramType = paramTypes[i];
-			ParameterData paramData = getMetaData().getMetaData(method, i);
-			String cast = paramData.getCast();
+			JNIParameter param = params[i];
+			String cast = param.getCast();
 			if (cast != null && cast.length() != 0) {
 				if (cast.startsWith("(")) cast = cast.substring(1);
 				if (cast.endsWith(")")) cast = cast.substring(0, cast.length() - 1);
 				output(cast);
 			} else {
-				output(getTypeSignature4(paramType, paramData.getFlag(FLAG_STRUCT)));
+				paramType = param.getType(); paramType64 = param.getType64();
+				output(paramType.getTypeSignature4(!paramType.equals(paramType64), param.getFlag(FLAG_STRUCT)));
 			}
 		}
 		output("))objc_msgSend)");
-		generateFunctionCallRightSide(method, methodData, paramTypes, 1);
+		generateFunctionCallRightSide(method, params, 1);
 		outputln(";");
 		outputln("\t}");
 	}
 }
 
-void generateReturn(Method method, Class returnType, boolean needsReturn) {
-	if (needsReturn && returnType != Void.TYPE) {
+void generateReturn(JNIMethod method, JNIType returnType, boolean needsReturn) {
+	if (needsReturn && !returnType.isType("void")) {
 		outputln("\treturn rc;");
 	}
 }
 
-void generateMemmove(Method method, String function, Class[] paramTypes) {
-	generateEnterMacro(method, function);
+void generateMemmove(JNIMethod method, String function, String function64, JNIParameter[] params) {
+	generateEnterExitMacro(method, function, function64, true);
 	output("\t");
-	boolean get = paramTypes[0].isPrimitive();
-	String className = getClassName(paramTypes[get ? 1 : 0]);
+	boolean get = params[0].getType().isPrimitive();
+	String className = params[get ? 1 : 0].getType().getSimpleName();
 	output(get ? "if (arg1) get" : "if (arg0) set");
 	output(className);
 	output(get ? "Fields(env, arg1, (" : "Fields(env, arg0, (");
 	output(className);
 	output(get ? " *)arg0)" : " *)arg1)");
 	outputln(";");
-	generateExitMacro(method, function);	
+	generateEnterExitMacro(method, function, function64, false);	
 }
 
-void generateFunctionBody(Method method, MethodData methodData, String function, Class[] paramTypes, Class returnType) {
+void generateFunctionBody(JNIMethod method, String function, String function64, JNIParameter[] params, JNIType returnType, JNIType returnType64) {
 	outputln("{");
 	
 	/* Custom GTK memmoves. */
 	String name = method.getName();
 	if (name.startsWith("_")) name = name.substring(1);
-	boolean isMemove = (name.equals("memmove") || name.equals("MoveMemory")) && paramTypes.length == 2 && returnType == Void.TYPE;
+	boolean isMemove = (name.equals("memmove") || name.equals("MoveMemory")) && params.length == 2 && returnType.isType("void");
 	if (isMemove) {
-		generateMemmove(method, function, paramTypes);
+		generateMemmove(method, function, function64, params);
 	} else {
-		boolean needsReturn = generateLocalVars(method, paramTypes, returnType);
-		generateEnterMacro(method, function);
-		boolean genFailTag = generateGetters(method, paramTypes);
-		if (methodData.getFlag(FLAG_DYNAMIC)) {
-			generateDynamicFunctionCall(method, methodData, paramTypes, returnType, needsReturn);
+		boolean needsReturn = generateLocalVars(method, params, returnType, returnType64);
+		generateEnterExitMacro(method, function, function64, true);
+		boolean genFailTag = generateGetters(method, params);
+		if (method.getFlag(FLAG_DYNAMIC)) {
+			generateDynamicFunctionCall(method, params, returnType, returnType64, needsReturn);
 		} else {
-			generateFunctionCall(method, methodData, paramTypes, returnType, needsReturn);
+			generateFunctionCall(method, params, returnType, returnType64, needsReturn);
 		}
 		if (genFailTag) outputln("fail:");
-		generateSetters(method, paramTypes);
-		generateExitMacro(method, function);
+		generateSetters(method, params);
+		generateEnterExitMacro(method, function, function64, false);
 		generateReturn(method, returnType, needsReturn);
 	}
 	
 	outputln("}");
 }
 
-void generateFunctionPrototype(Method method, String function, Class[] paramTypes, Class returnType, boolean singleLine) {
+void generateFunctionPrototype(JNIMethod method, String function, JNIParameter[] params, JNIType returnType, JNIType returnType64, boolean singleLine) {
 	output("JNIEXPORT ");
-	output(getTypeSignature2(returnType));
+	output(returnType.getTypeSignature2(!returnType.equals(returnType64)));
 	output(" JNICALL ");
-	output(getClassName(method.getDeclaringClass()));
+	output(method.getDeclaringClass().getSimpleName());
 	output("_NATIVE(");
 	output(function);
 	if (singleLine) {
@@ -885,51 +825,44 @@ void generateFunctionPrototype(Method method, String function, Class[] paramType
 		output("jobject");
 	}
 	output(" that");
-	for (int i = 0; i < paramTypes.length; i++) {
-		Class paramType = paramTypes[i];
+	for (int i = 0; i < params.length; i++) {
 		output(", ");
-		output(getTypeSignature2(paramType));
+		JNIType paramType = params[i].getType(), paramType64 = params[i].getType64();
+		output(paramType.getTypeSignature2(!paramType.equals(paramType64)));
 		output(" arg" + i);
 	}
 	output(")");
 	if (!singleLine) outputln();
 }
 
-void generateSourceStart(String function) {
-	output("#ifndef NO_");
-	outputln(function);
+void generateSourceStart(String function, String function64) {
+	if (function.equals(function64)) {
+		output("#ifndef NO_");
+		outputln(function);
+	} else {
+		output("#if (!defined(NO_");
+		output(function);
+		output(") && !defined(");
+		output(JNI64);
+		output(")) || (!defined(NO_");
+		output(function64);
+		output(") && defined(");
+		output(JNI64);
+		outputln("))");
+	}
 }
 
 void generateSourceEnd(String function) {
 	outputln("#endif");
 }
 
-boolean isCritical(Class paramType, ParameterData paramData) {
-	return paramType.isArray() && paramType.getComponentType().isPrimitive() && paramData.getFlag(FLAG_CRITICAL);
+boolean isCritical(JNIParameter param) {
+	JNIType paramType = param.getType();
+	return paramType.isArray() && paramType.getComponentType().isPrimitive() && param.getFlag(FLAG_CRITICAL);
 }
 
-boolean isSystemClass(Class type) {
-	return type == Object.class || type == Class.class;
-}
-
-public static void main(String[] args) {
-//	args = new String[]{"org.eclipse.swt.internal.win32.OS"};
-	if (args.length < 1) {
-		System.out.println("Usage: java NativesGenerator <className1> <className2>");
-		return;
-	}
-	try {
-		NativesGenerator gen = new NativesGenerator();
-		for (int i = 0; i < args.length; i++) {
-			String clazzName = args[i];
-			Class clazz = Class.forName(clazzName);
-			gen.generate(clazz);
-//			gen.generate(clazz, "CommandBar_Destroy");
-		}
-	} catch (Exception e) {
-		System.out.println("Problem");
-		e.printStackTrace(System.out);
-	}
+boolean isSystemClass(JNIType type) {
+	return type.isType("java.lang.Object") || type.isType("java.lang.Class") ;
 }
 
 }
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ParameterData.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ParameterData.java
deleted file mode 100644
index f95ac2c528..0000000000
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ParameterData.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.tools.internal;
-
-import java.lang.reflect.Method;
-
-public class ParameterData extends ItemData {
-	
-	Method method;
-	int parameter;
-
-public ParameterData(Method method, int parameter, String str) {
-	super(str);
-	this.method = method;
-	this.parameter = parameter;
-}
-
-public static String[] getAllFlags() {
-	return new String[]{FLAG_NO_IN, FLAG_NO_OUT, FLAG_CRITICAL, FLAG_INIT, FLAG_STRUCT, FLAG_UNICODE, FLAG_SENTINEL, FLAG_GCOBJECT};
-}
-
-public String getCast() {
-	String cast = ((String)getParam("cast")).trim();
-	if (cast.length() > 0) {
-		if (!cast.startsWith("(")) cast = "(" + cast;
-		if (!cast.endsWith(")")) cast = cast + ")";
-	}
-	return cast;
-}
-
-public Method getMethod() {
-	return method;
-}
-
-public int getParameter() {
-	return parameter;
-}
-
-public void setCast(String str) {
-	setParam("cast", str);
-}
-
-}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectClass.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectClass.java
new file mode 100644
index 0000000000..be9c6042a3
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectClass.java
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tools.internal;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.ASTParser;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+
+public class ReflectClass extends ReflectItem implements JNIClass {
+	Class clazz;
+	ReflectField[] fields;
+	ReflectMethod[] methods;
+	MetaData metaData;
+	String sourcePath;
+
+public ReflectClass(Class clazz) {
+	this(clazz, null, null);
+}
+
+public ReflectClass(Class clazz, MetaData data, String sourcePath) {
+	this.clazz = clazz;
+	this.metaData = data;
+	this.sourcePath = sourcePath;
+}
+
+void checkMembers() {
+	if (fields != null) return;
+	String source = null;
+	CompilationUnit unit = null;
+	if (JNIItem.GEN64) {
+		source = JNIGenerator.loadFile(sourcePath);
+		ASTParser parser = ASTParser.newParser(AST.JLS3);
+		parser.setSource(source.toCharArray());
+		unit = (CompilationUnit)parser.createAST(null);
+	}
+	Field[] fields = clazz.getDeclaredFields();
+	this.fields = new ReflectField[fields.length];
+	for (int i = 0; i < fields.length; i++) {
+		this.fields[i] = new ReflectField(this, fields[i], source, unit);
+	}
+	Method[] methods = clazz.getDeclaredMethods();
+	this.methods = new ReflectMethod[methods.length];
+	for (int i = 0; i < methods.length; i++) {
+		this.methods[i] = new ReflectMethod(this, methods[i], source, unit);
+	}
+}
+
+public int hashCode() {
+	return clazz.hashCode();
+}
+
+public boolean equals(Object obj) {
+	if (!(obj instanceof ReflectClass)) return false;
+	return ((ReflectClass)obj).clazz.equals(clazz);
+}
+
+public JNIField[] getDeclaredFields() {
+	checkMembers();
+	JNIField[] result = new JNIField[fields.length];
+	System.arraycopy(fields, 0, result, 0, result.length);
+	return result;
+}
+
+public JNIMethod[] getDeclaredMethods() {
+	checkMembers();
+	JNIMethod[] result = new JNIMethod[methods.length];
+	System.arraycopy(methods, 0, result, 0, result.length);
+	return result;
+}
+
+public String getName() {
+	return clazz.getName();
+}
+
+public JNIClass getSuperclass() {
+	Class superclazz = clazz.getSuperclass();
+	String path = new File(sourcePath).getParent() + "/" + superclazz.getSimpleName() + ".java";
+	return new ReflectClass(superclazz, metaData, path);
+}
+
+public String getSimpleName() {
+	String name = clazz.getName();
+	int index = name.lastIndexOf('.') + 1;
+	return name.substring(index, name.length());
+}
+
+public String getExclude() {
+	return (String)getParam("exclude");
+}
+
+public String getMetaData() {
+	String key = JNIGenerator.toC(clazz.getName());
+	return metaData.getMetaData(key, "");
+}
+
+public void setExclude(String str) { 
+	setParam("exclude", str);
+}
+
+public void setMetaData(String value) {
+	String key = JNIGenerator.toC(clazz.getName());
+	metaData.setMetaData(key, value);
+}
+
+public String toString() {
+	return clazz.toString();
+}
+
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectField.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectField.java
new file mode 100644
index 0000000000..350662fd5e
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectField.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tools.internal;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.Iterator;
+
+import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.FieldDeclaration;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
+import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
+
+public class ReflectField extends ReflectItem implements JNIField {
+	Field field;
+	ReflectType type, type64;
+	ReflectClass declaringClass;
+	
+public ReflectField(ReflectClass declaringClass, Field field, String source, CompilationUnit unit) {
+	this.declaringClass = declaringClass;
+	this.field = field;
+	Class clazz = field.getType();
+	type = new ReflectType(clazz);
+	type64 = type;
+	boolean changes = canChange64(clazz);
+	if (changes && new File(declaringClass.sourcePath).exists()) {
+		TypeDeclaration type1 = (TypeDeclaration)unit.types().get(0);
+		Class result = null;
+		FieldDeclaration[] fields = type1.getFields();
+		for (int i = 0; i < fields.length && result == null; i++) {
+			FieldDeclaration node = fields[i];
+			for (Iterator iterator = node.fragments().iterator(); iterator.hasNext();) {
+				VariableDeclarationFragment decl = (VariableDeclarationFragment) iterator.next();
+				if (decl.getName().getIdentifier().equals(field.getName())) {
+					String s = source.substring(node.getStartPosition(), node.getStartPosition() + node.getLength());
+					if (clazz == int.class && s.indexOf("int /*long*/") != -1) type64 = new ReflectType(long.class);
+					else if (clazz == float.class && s.indexOf("float /*double*/") != -1) type64 = new ReflectType(double.class);
+					else if (clazz == int[].class && (s.indexOf("int /*long*/") != -1 || s.indexOf("int[] /*long[]*/") != -1)) type64 = new ReflectType(long[].class);
+					else if (clazz == float[].class && (s.indexOf("float /*double*/") != -1|| s.indexOf("float[] /*double[]*/") != -1)) type = new ReflectType(double[].class);
+					else if (clazz == long.class && s.indexOf("long /*int*/") != -1) type = new ReflectType(int.class);
+					else if (clazz == double.class && s.indexOf("double /*float*/") != -1) type = new ReflectType(float.class);
+					else if (clazz == long[].class && (s.indexOf("long /*int*/") != -1|| s.indexOf("long[] /*int[]*/") != -1)) type = new ReflectType(int[].class);
+					else if (clazz == double[].class && (s.indexOf("double /*float*/") != -1|| s.indexOf("double[] /*float[]*/") != -1)) type = new ReflectType(float[].class);
+					break;
+				}
+			}
+		}
+	}	
+}
+
+public int hashCode() {
+	return field.hashCode();
+}
+
+public boolean equals(Object obj) {
+	if (!(obj instanceof ReflectField)) return false;
+	return ((ReflectField)obj).field.equals(field);
+}
+
+public JNIClass getDeclaringClass() {
+	return declaringClass;
+}
+
+public int getModifiers() {
+	return field.getModifiers();
+}
+
+public String getName() {
+	return field.getName();
+}
+
+public JNIType getType() {
+	return type;
+}
+
+public JNIType getType64() {
+	return type64;
+}
+
+public String getAccessor() {
+	return (String)getParam("accessor");
+}
+
+public String getCast() {
+	String cast = ((String)getParam("cast")).trim();
+	if (cast.length() > 0) {
+		if (!cast.startsWith("(")) cast = "(" + cast;
+		if (!cast.endsWith(")")) cast = cast + ")";
+	}
+	return cast;
+}
+
+public String getExclude() {
+	return (String)getParam("exclude");
+}
+
+public String getMetaData() {
+	String className = getDeclaringClass().getSimpleName();
+	String key = className + "_" + field.getName();
+	return declaringClass.metaData.getMetaData(key, "");
+}
+
+public void setAccessor(String str) { 
+	setParam("accessor", str);
+}
+
+public void setCast(String str) {
+	setParam("cast", str);
+}
+
+public void setExclude(String str) { 
+	setParam("exclude", str);
+}
+
+public void setMetaData(String value) {
+	String className = declaringClass.getSimpleName();
+	String key = className + "_" + field.getName();
+	declaringClass.metaData.setMetaData(key, value);
+}
+
+public String toString() {
+	return field.toString();
+}
+
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectItem.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectItem.java
new file mode 100644
index 0000000000..299de3a588
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectItem.java
@@ -0,0 +1,96 @@
+package org.eclipse.swt.tools.internal;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Set;
+
+public abstract class ReflectItem extends AbstractItem {
+
+static boolean convertTo32Bit(JNIType[] paramTypes, boolean floatingPointTypes) {
+	boolean changed = false;
+	for (int i = 0; i < paramTypes.length; i++) {
+		JNIType paramType = paramTypes[i];
+		if (paramType.isType("long")) {
+			paramTypes[i] = new ReflectType(Integer.TYPE);
+			changed = true;
+		}
+		if (paramType.isType("[J")) {
+			paramTypes[i] = new ReflectType(int[].class);
+			changed = true;
+		}
+		if (floatingPointTypes) {
+			if (paramType.isType("double")) {
+				paramTypes[i] = new ReflectType(Float.TYPE);
+				changed = true;
+			}
+			if (paramType.isType("[D")) {
+				paramTypes[i] = new ReflectType(float[].class);
+				changed = true;
+			}
+		}
+	}
+	return changed;	
+}
+
+boolean canChange64(Class clazz) {
+	if (!GEN64) return false;
+	return clazz == Integer.TYPE ||
+		clazz == Long.TYPE ||
+		clazz == Float.TYPE ||
+		clazz == Double.TYPE ||
+		clazz == int[].class ||
+		clazz == long[].class ||
+		clazz == float[].class ||
+		clazz == double[].class;
+}
+
+public String flatten() {
+	checkParams();
+	StringBuffer buffer = new StringBuffer();
+	Set set = params.keySet();
+	String[] keys = (String[])set.toArray(new String[set.size()]);
+	Arrays.sort(keys);
+	for (int j = 0; j < keys.length; j++) {
+		String key = keys[j];
+		Object value = params.get(key);
+		String valueStr = "";
+		if (value instanceof String) {
+			valueStr = (String)value;
+		} else if (value instanceof String[]) {
+			String[] values = (String[])value;
+			StringBuffer valueBuffer = new StringBuffer();
+			for (int i = 0; i < values.length; i++) {
+				if (i != 0) valueBuffer.append(" ");
+				valueBuffer.append(values[i]);
+			}
+			valueStr = valueBuffer.toString();
+		} else {
+			valueStr = value.toString();
+		}
+		if (valueStr.length() > 0) {
+			if (buffer.length() != 0) buffer.append(",");
+			buffer.append(key);
+			buffer.append("=");
+			buffer.append(valueStr);
+		}
+	}
+	return buffer.toString();
+}
+
+public void parse(String str) {
+	this.params = new HashMap();
+	if (str.length() == 0) return;
+	String[] params = split(str, ",");
+	for (int i = 0; i < params.length; i++) {
+		String param = params[i];
+		int equals = param.indexOf('=');
+		if (equals ==  -1) {
+			System.out.println("Error: " + str + " param " + param);
+		}
+		String key = param.substring(0, equals).trim();
+		String value = param.substring(equals + 1).trim();
+		setParam(key, value);
+	}
+}
+
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectMethod.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectMethod.java
new file mode 100644
index 0000000000..b8d18bcba0
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectMethod.java
@@ -0,0 +1,240 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tools.internal;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
+import org.eclipse.jdt.core.dom.Modifier;
+import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
+
+public class ReflectMethod extends ReflectItem implements JNIMethod {
+	Method method;
+	ReflectType returnType, returnType64;
+	ReflectType[] paramTypes, paramTypes64;
+	ReflectClass declaringClass;
+	Boolean unique;
+	
+public ReflectMethod(ReflectClass declaringClass, Method method, String source, CompilationUnit unit) {
+	this.method = method;
+	this.declaringClass = declaringClass;	
+	Class returnType = method.getReturnType();
+	Class[] paramTypes = method.getParameterTypes();
+	this.returnType = new ReflectType(returnType);
+	this.returnType64 = this.returnType;
+	this.paramTypes = new ReflectType[paramTypes.length];
+	this.paramTypes64 = new ReflectType[paramTypes.length];
+	for (int i = 0; i < this.paramTypes.length; i++) {
+		this.paramTypes[i] = this.paramTypes64[i] = new ReflectType(paramTypes[i]);
+	}
+	boolean changes = false;
+	if ((method.getModifiers() & Modifier.NATIVE) != 0) {
+		changes = canChange64(returnType);
+		if (!changes) {
+			for (int i = 0; i < paramTypes.length && !changes; i++) {
+				changes |= canChange64(paramTypes[i]);
+			}
+		}
+	}
+	if (changes && new File(declaringClass.sourcePath).exists()) {
+		String name = method.getName();
+		TypeDeclaration type = (TypeDeclaration)unit.types().get(0);
+		MethodDeclaration decl = null;
+		MethodDeclaration[] methods = type.getMethods();
+		for (int i = 0; i < methods.length && decl == null; i++) {
+			MethodDeclaration node = methods[i];
+			if (node.getName().getIdentifier().equals(name)) {
+				if (!returnType.getSimpleName().equals(node.getReturnType2().toString())) continue;
+				List parameters = node.parameters();
+				if (parameters.size() != paramTypes.length) continue;
+				decl = node;
+				for (int j = 0; j < paramTypes.length; j++) {
+					if (!paramTypes[j].getSimpleName().equals(((SingleVariableDeclaration)parameters.get(j)).getType().toString())) {
+						decl = null;
+						break;
+					}
+				}
+			}
+		}
+		for (int i = 0; i < paramTypes.length; i++) {
+			if (canChange64(paramTypes[i])) {
+				Class clazz = paramTypes[i];
+				SingleVariableDeclaration node = (SingleVariableDeclaration)decl.parameters().get(i);
+				String s = source.substring(node.getStartPosition(), node.getStartPosition() + node.getLength());
+				if (clazz == int.class && s.indexOf("int /*long*/") != -1) this.paramTypes64[i] = new ReflectType(long.class);
+				else if (clazz == int[].class && (s.indexOf("int /*long*/") != -1 || s.indexOf("int[] /*long[]*/") != -1)) this.paramTypes64[i] = new ReflectType(long[].class);
+				else if (clazz == float.class && s.indexOf("float /*double*/") != -1) this.paramTypes64[i] = new ReflectType(double.class);
+				else if (clazz == float[].class && (s.indexOf("float /*double*/") != -1|| s.indexOf("float[] /*double[]*/") != -1)) this.paramTypes64[i] = new ReflectType(double[].class);
+				else if (clazz == long.class && s.indexOf("long /*int*/") != -1) this.paramTypes[i] = new ReflectType(int.class);
+				else if (clazz == long[].class && (s.indexOf("long /*int*/") != -1|| s.indexOf("long[] /*int[]*/") != -1)) this.paramTypes[i] = new ReflectType(int[].class);
+				else if (clazz == double.class && s.indexOf("double /*float*/") != -1) this.paramTypes[i] = new ReflectType(float.class);
+				else if (clazz == double[].class && (s.indexOf("double /*float*/") != -1|| s.indexOf("double[] /*float[]*/") != -1)) this.paramTypes[i] = new ReflectType(float[].class);
+			}
+		}
+		if (canChange64(returnType)) {
+			Class clazz = returnType;
+			ASTNode node = decl.getReturnType2();
+			String s = source.substring(node.getStartPosition(), decl.getName().getStartPosition());
+			if (clazz == int.class && s.indexOf("int /*long*/") != -1) this.returnType64 = new ReflectType(long.class);
+			else if (clazz == int[].class && (s.indexOf("int /*long*/") != -1 || s.indexOf("int[] /*long[]*/") != -1)) this.returnType64 = new ReflectType(long[].class);
+			else if (clazz == float.class && s.indexOf("float /*double*/") != -1) this.returnType64 = new ReflectType(double.class);
+			else if (clazz == float[].class && (s.indexOf("float /*double*/") != -1|| s.indexOf("float[] /*double[]*/") != -1)) this.returnType64 = new ReflectType(double[].class);
+			else if (clazz == long.class && s.indexOf("long /*int*/") != -1) this.returnType = new ReflectType(int.class);
+			else if (clazz == long[].class && (s.indexOf("long /*int*/") != -1|| s.indexOf("long[] /*int[]*/") != -1)) this.returnType = new ReflectType(int[].class);
+			else if (clazz == double.class && s.indexOf("double /*float*/") != -1) this.returnType = new ReflectType(float.class);
+			else if (clazz == double[].class && (s.indexOf("double /*float*/") != -1|| s.indexOf("double[] /*float[]*/") != -1)) this.returnType = new ReflectType(float[].class);
+		}		
+	}
+}
+
+public int hashCode() {
+	return method.hashCode();
+}
+
+public boolean equals(Object obj) {
+	if (!(obj instanceof ReflectMethod)) return false;
+	return ((ReflectMethod)obj).method.equals(method);
+}
+
+public JNIClass getDeclaringClass() {
+	return declaringClass;
+}
+
+public int getModifiers() {
+	return method.getModifiers();
+}
+
+public String getName() {
+	return method.getName();
+}
+
+public boolean isNativeUnique() {
+	if (unique != null) return unique.booleanValue();
+	boolean result = true;
+	String name = getName();
+	JNIMethod[] methods = declaringClass.getDeclaredMethods();
+	for (int i = 0; i < methods.length; i++) {
+		JNIMethod mth = methods[i];
+		if ((mth.getModifiers() & Modifier.NATIVE) != 0 &&
+			this != mth && !this.equals(mth) &&
+			name.equals(mth.getName()))
+			{
+				result = false;
+				break;
+			}
+	}
+	unique = new Boolean(result);
+	return result;
+}
+
+public JNIType[] getParameterTypes() {
+	return paramTypes;
+}
+
+public JNIType[] getParameterTypes64() {
+	return paramTypes64;
+}
+
+public JNIParameter[] getParameters() {
+	Class[] paramTypes = method.getParameterTypes();
+	ReflectParameter[] result = new ReflectParameter[paramTypes.length];
+	for (int i = 0; i < paramTypes.length; i++) {
+		result[i] = new ReflectParameter(this, i);
+	}
+	return result;
+}
+
+public JNIType getReturnType() {
+	return returnType;
+}
+
+public JNIType getReturnType64() {
+	return returnType64;
+}
+
+public String getAccessor() {
+	return (String)getParam("accessor");
+}
+
+public String getExclude() {
+	return (String)getParam("exclude");
+}
+
+public String getMetaData() {
+	String className = getDeclaringClass().getSimpleName();
+	String key = className + "_" + JNIGenerator.getFunctionName(this);
+	MetaData metaData = declaringClass.metaData;
+	String value = metaData.getMetaData(key, null);
+	if (value == null) {
+		key = className + "_" + method.getName();
+		value = metaData.getMetaData(key, null);
+	}
+	/*
+	* Support for 64 bit port.
+	*/
+	if (value == null) {
+		JNIType[] paramTypes = getParameterTypes();
+		if (convertTo32Bit(paramTypes, true)) {
+			key = className + "_" + JNIGenerator.getFunctionName(this, paramTypes);
+			value = metaData.getMetaData(key, null);
+		}
+		if (value == null) {
+			paramTypes = getParameterTypes();
+			if (convertTo32Bit(paramTypes, false)) {
+				key = className + "_" + JNIGenerator.getFunctionName(this, paramTypes);
+				value = metaData.getMetaData(key, null);
+			}
+		}
+	}
+	/*
+	* Support for lock.
+	*/
+	if (value == null && method.getName().startsWith("_")) {
+		key = className + "_" + JNIGenerator.getFunctionName(this).substring(2);
+		value = metaData.getMetaData(key, null);
+		if (value == null) {
+			key = className + "_" + method.getName().substring(1);
+			value = metaData.getMetaData(key, null);
+		}
+	}
+	if (value == null) value = "";	
+	return value;
+}
+
+public void setAccessor(String str) { 
+	setParam("accessor", str);
+}
+
+public void setExclude(String str) { 
+	setParam("exclude", str);
+}
+
+public void setMetaData(String value) {
+	String key;
+	String className = declaringClass.getSimpleName();
+	if (isNativeUnique()) {
+		key = className + "_" + method.getName ();
+	} else {
+		key = className + "_" + JNIGenerator.getFunctionName(this);
+	}
+	declaringClass.metaData.setMetaData(key, value);
+}
+
+public String toString() {
+	return method.toString();
+}
+
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectParameter.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectParameter.java
new file mode 100644
index 0000000000..1ec4593e22
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectParameter.java
@@ -0,0 +1,102 @@
+package org.eclipse.swt.tools.internal;
+
+import java.io.File;
+
+public class ReflectParameter extends ReflectItem implements JNIParameter {
+	ReflectMethod method;
+	int parameter;
+
+public ReflectParameter(ReflectMethod method, int parameter) {
+	this.method = method;
+	this.parameter = parameter;
+}
+
+public String getCast() {
+	String cast = ((String)getParam("cast")).trim();
+	if (cast.length() > 0) {
+		if (!cast.startsWith("(")) cast = "(" + cast;
+		if (!cast.endsWith(")")) cast = cast + ")";
+	}
+	return cast;
+}
+
+public String getMetaData() {
+	String className = method.getDeclaringClass().getSimpleName();
+	String key = className + "_" + JNIGenerator.getFunctionName(method) + "_" + parameter;
+	MetaData metaData = method.declaringClass.metaData;
+	String value = metaData.getMetaData(key, null);
+	if (value == null) {
+		key = className + "_" + method.getName() + "_" + parameter;
+		value = metaData.getMetaData(key, null);
+	}
+	/*
+	* Support for 64 bit port.
+	*/
+	if (value == null) {
+		JNIType[] paramTypes = method.getParameterTypes();
+		if (ReflectItem.convertTo32Bit(paramTypes, true)) {
+			key = className + "_" + JNIGenerator.getFunctionName(method, paramTypes) + "_" + parameter;
+			value = metaData.getMetaData(key, null);
+		}
+		if (value == null) {
+			paramTypes = method.getParameterTypes();
+			if (ReflectItem.convertTo32Bit(paramTypes, false)) {
+				key = className + "_" + JNIGenerator.getFunctionName(method, paramTypes) + "_" + parameter;
+				value = metaData.getMetaData(key, null);
+			}
+		}
+	}
+	/*
+	* Support for lock.
+	*/
+	if (value == null && method.getName().startsWith("_")) {
+		key = className + "_" + JNIGenerator.getFunctionName(method).substring(2) + "_" + parameter;
+		value = metaData.getMetaData(key, null);
+		if (value == null) {
+			key = className + "_" + method.getName().substring(1) + "_" + parameter;
+			value = metaData.getMetaData(key, null);
+		}
+	}
+	if (value == null) value = "";	
+	return value;
+}
+
+public JNIMethod getMethod() {
+	return method;
+}
+
+public JNIClass getTypeClass() {
+	ReflectType type = (ReflectType)getType();
+	ReflectClass declaringClass = method.declaringClass;
+	String sourcePath  = declaringClass.sourcePath;
+	sourcePath = new File(sourcePath).getParent() + "/" + type.getSimpleName() + ".java";
+	return new ReflectClass(type.clazz, declaringClass.metaData, sourcePath);
+}
+
+public JNIType getType() {
+	return method.getParameterTypes()[parameter];
+}
+
+public JNIType getType64() {
+	return method.getParameterTypes64()[parameter];
+}
+
+public int getParameter() {
+	return parameter;
+}
+
+public void setCast(String str) {
+	setParam("cast", str);
+}
+
+public void setMetaData(String value) {
+	String key;
+	String className = method.getDeclaringClass().getSimpleName();
+	if (method.isNativeUnique()) {
+		key = className + "_" + method.getName () + "_" + parameter;
+	} else {
+		key = className + "_" + JNIGenerator.getFunctionName(method) + "_" + parameter;
+	}
+	method.declaringClass.metaData.setMetaData(key, value);
+}
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectType.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectType.java
new file mode 100644
index 0000000000..6c0a51df9d
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectType.java
@@ -0,0 +1,132 @@
+package org.eclipse.swt.tools.internal;
+
+public class ReflectType implements JNIType {
+	Class clazz;
+
+public ReflectType(Class clazz) {
+	this.clazz = clazz;
+}
+
+public boolean equals(Object obj) {
+	if (obj == this) return true;
+	if (!(obj instanceof ReflectType)) return false;
+	return ((ReflectType)obj).clazz == clazz;
+}
+
+public JNIType getComponentType() {
+	return new ReflectType(clazz.getComponentType());
+}
+
+public String getName() {
+	return clazz.getName();
+}
+
+public String getSimpleName() {
+	String name = clazz.getName();
+	int index = name.lastIndexOf('.') + 1;
+	return name.substring(index, name.length());
+}
+
+public String getTypeSignature(boolean define) {
+	if (clazz == Void.TYPE) return "V";
+	if (clazz == Integer.TYPE) return define ? "I_J" : "I";
+	if (clazz == Boolean.TYPE) return "Z";
+	if (clazz == Long.TYPE) return define ? "J_J" : "J";
+	if (clazz == Short.TYPE) return "S";
+	if (clazz == Character.TYPE) return "C";
+	if (clazz == Byte.TYPE) return "B";
+	if (clazz == Float.TYPE) return define ? "F_D" : "F";
+	if (clazz == Double.TYPE) return define ? "F_D" : "D";
+	if (clazz == String.class) return "Ljava/lang/String;";
+	if (clazz.isArray()) {
+		if (define) return getComponentType().getTypeSignature(define) + "Array";
+		return "[" + getComponentType().getTypeSignature(define);
+	}
+	return "L" + clazz.getName().replace('.', '/') + ";";
+}
+
+public String getTypeSignature1(boolean define) {
+	if (clazz == Void.TYPE) return "Void";
+	if (clazz == Integer.TYPE) return define ? "IntLong" : "Int";
+	if (clazz == Boolean.TYPE) return "Boolean";
+	if (clazz == Long.TYPE) return define ? "IntLong" : "Long";
+	if (clazz == Short.TYPE) return "Short";
+	if (clazz == Character.TYPE) return "Char";
+	if (clazz == Byte.TYPE) return "Byte";
+	if (clazz == Float.TYPE) return define ? "FloatDouble" : "Float";
+	if (clazz == Double.TYPE) return define ? "FloatDouble" : "Double";
+	if (clazz == String.class) return "String";
+	return "Object";
+}
+
+public String getTypeSignature2(boolean define) {
+	if (clazz == Void.TYPE) return "void";
+	if (clazz == Integer.TYPE) return define ? "jintLong" : "jint";
+	if (clazz == Boolean.TYPE) return "jboolean";
+	if (clazz == Long.TYPE) return define ? "jintLong" : "jlong";
+	if (clazz == Short.TYPE) return "jshort";
+	if (clazz == Character.TYPE) return "jchar";
+	if (clazz == Byte.TYPE) return "jbyte";
+	if (clazz == Float.TYPE) return define ? "jfloatDouble" : "jfloat";
+	if (clazz == Double.TYPE) return define ? "jfloatDouble" : "jdouble";
+	if (clazz == String.class) return "jstring";
+	if (clazz == Class.class) return "jclass";
+	if (clazz.isArray()) {
+		return getComponentType().getTypeSignature2(define) + "Array";
+	}
+	return "jobject";
+}
+
+public String getTypeSignature3(boolean define) {
+	if (clazz == Void.TYPE) return "void";
+	if (clazz == Integer.TYPE) return "int";
+	if (clazz == Boolean.TYPE) return "boolean";
+	if (clazz == Long.TYPE) return "long";
+	if (clazz == Short.TYPE) return "short";
+	if (clazz == Character.TYPE) return "char";
+	if (clazz == Byte.TYPE) return "byte";
+	if (clazz == Float.TYPE) return "float";
+	if (clazz == Double.TYPE) return "double";
+	if (clazz == String.class) return "String";
+	if (clazz.isArray()) {
+		return getComponentType().getTypeSignature3(define) + "[]";
+	}
+	return clazz.getName();
+}
+
+public String getTypeSignature4(boolean define, boolean struct) {
+	if (clazz == Void.TYPE) return "void";
+	if (clazz == Integer.TYPE) return define ? "jintLong" : "jint";
+	if (clazz == Boolean.TYPE) return "jboolean";
+	if (clazz == Long.TYPE) return define ? "jintLong" : "jlong";
+	if (clazz == Short.TYPE) return "jshort";
+	if (clazz == Character.TYPE) return "jchar";
+	if (clazz == Byte.TYPE) return "jbyte";
+	if (clazz == Float.TYPE) return define ? "jfloatDouble" : "jfloat";
+	if (clazz == Double.TYPE) return define ? "jfloatDouble" : "jdouble";
+	if (clazz == String.class) return "jstring";
+	if (clazz.isArray()) {
+		String sig = getComponentType().getTypeSignature4(define, struct);
+		return struct ? sig : sig + " *";
+	}
+	String sig = getSimpleName(); 
+	return struct ? sig : sig + " *";
+}
+
+public int hashCode() {
+	return clazz.hashCode();
+}
+
+public boolean isArray() {
+	return clazz.isArray();
+}
+
+public boolean isPrimitive() {
+	return clazz.isPrimitive();
+}
+
+public boolean isType(String type) {
+	return clazz.getName().equals(type);
+}
+
+}
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/SizeofGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/SizeofGenerator.java
index 8926089d80..408b220c76 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/SizeofGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/SizeofGenerator.java
@@ -10,13 +10,13 @@
  *******************************************************************************/
 package org.eclipse.swt.tools.internal;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Modifier;
 
 public class SizeofGenerator extends JNIGenerator {
 
 
-public void generate(Class clazz) {
-	String className = getClassName(clazz);
+public void generate(JNIClass clazz) {
+	String className = clazz.getSimpleName();
 	output("\tprintf(\"");
 	output(className);
 	output("=%d\\n\", sizeof(");
@@ -32,16 +32,16 @@ public void generate() {
 	outputln("}");
 }
 
-public void generate(Field[] fields) {
+public void generate(JNIField[] fields) {
 	sort(fields);	
 	for (int i = 0; i < fields.length; i++) {
-		Field field = fields[i];
+		JNIField field = fields[i];
 		if ((field.getModifiers() & Modifier.FINAL) == 0) continue;
 		generate(field);
 	}
 }
 
-public void generate(Field field) {
+public void generate(JNIField field) {
 	output("\tprintf(\"");
 	output(field.getName());
 	output("=%d\\n\", sizeof(");
@@ -59,7 +59,7 @@ public static void main(String[] args) {
 		for (int i = 0; i < args.length; i++) {
 			String clazzName = args[i];
 			Class clazz = Class.forName(clazzName);
-			gen.generate(clazz);
+			gen.generate(new ReflectClass(clazz));
 		}
 	} catch (Exception e) {
 		System.out.println("Problem");
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java
index e9e048ec48..664f408219 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.swt.tools.internal;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Modifier;
 
 public class StatsGenerator extends JNIGenerator {
 
@@ -34,7 +34,7 @@ public void generateIncludes() {
 	}
 }
 
-public void generate(Class clazz) {
+public void generate(JNIClass clazz) {
 	if (header) {
 		generateHeaderFile(clazz);
 	} else {
@@ -50,15 +50,15 @@ public String getSuffix() {
 	return "_stats";
 }
 
-void generateHeaderFile(Class clazz){
+void generateHeaderFile(JNIClass clazz){
 	generateNATIVEMacros(clazz);
-	Method[] methods = clazz.getDeclaredMethods();
+	JNIMethod[] methods = clazz.getDeclaredMethods();
 	sort(methods);
 	generateFunctionEnum(methods);	
 }
 
-void generateNATIVEMacros(Class clazz) {
-	String className = getClassName(clazz);
+void generateNATIVEMacros(JNIClass clazz) {
+	String className = clazz.getSimpleName();
 	outputln("#ifdef NATIVE_STATS");
 	output("extern int ");
 	output(className);
@@ -96,17 +96,17 @@ void generateNATIVEMacros(Class clazz) {
 	outputln();	
 }
 
-void generateSourceFile(Class clazz) {
+void generateSourceFile(JNIClass clazz) {
 	outputln("#ifdef NATIVE_STATS");
 	outputln();
-	Method[] methods = clazz.getDeclaredMethods();
+	JNIMethod[] methods = clazz.getDeclaredMethods();
 	int methodCount = 0;
 	for (int i = 0; i < methods.length; i++) {
-		Method method = methods[i];
+		JNIMethod method = methods[i];
 		if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
 		methodCount++;
 	}
-	String className = getClassName(clazz);
+	String className = clazz.getSimpleName();
 	output("int ");
 	output(className);
 	output("_nativeFunctionCount = ");
@@ -122,11 +122,24 @@ void generateSourceFile(Class clazz) {
 	outputln("_nativeFunctionNames[] = {");
 	sort(methods);
 	for (int i = 0; i < methods.length; i++) {
-		Method method = methods[i];
+		JNIMethod method = methods[i];
 		if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
+		String function = getFunctionName(method), function64 = getFunctionName(method, method.getParameterTypes64());
+		if (!function.equals(function64)) {
+			output("#ifndef ");
+			output(JNI64);
+			outputln();
+		}
 		output("\t\"");
-		output(getFunctionName(method));
+		output(function);
 		outputln("\",");
+		if (!function.equals(function64)) {
+			outputln("#else");
+			output("\t\"");
+			output(function64);
+			outputln("\",");
+			outputln("#endif");
+		}
 		if (progress != null) progress.step();
 	}
 	outputln("};");
@@ -178,20 +191,33 @@ void generateStatsNatives(String className) {
 	outputln("}");
 }
 
-void generateFunctionEnum(Method[] methods) {
+void generateFunctionEnum(JNIMethod[] methods) {
 	if (methods.length == 0) return;
 	outputln("typedef enum {");
 	for (int i = 0; i < methods.length; i++) {
-		Method method = methods[i];
+		JNIMethod method = methods[i];
 		if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
+		String function = getFunctionName(method), function64 = getFunctionName(method, method.getParameterTypes64());
+		if (!function.equals(function64)) {
+			output("#ifndef ");
+			output(JNI64);
+			outputln();
+		}
 		output("\t");
-		output(getFunctionName(method));
+		output(function);
 		outputln("_FUNC,");
+		if (!function.equals(function64)) {
+			outputln("#else");
+			output("\t");
+			output(function64);
+			outputln("_FUNC,");
+			outputln("#endif");
+		}
 		if (progress != null) progress.step();
 	}
-	Class clazz = methods[0].getDeclaringClass();
+	JNIClass clazz = methods[0].getDeclaringClass();
 	output("} ");
-	output(getClassName(clazz));
+	output(clazz.getSimpleName());
 	outputln("_FUNCS;");
 }
 
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StructsGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StructsGenerator.java
index 0d4312fc8e..beefb06b2b 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StructsGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StructsGenerator.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.swt.tools.internal;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Modifier;
 import java.util.HashSet;
 import java.util.Iterator;
 
@@ -42,11 +42,11 @@ public void generateIncludes() {
 	outputln();
 }
 
-public void generate(Class clazz) {
+public void generate(JNIClass clazz) {
 	int j = 0;
-	Field[] fields = clazz.getDeclaredFields();
+	JNIField[] fields = clazz.getDeclaredFields();
 	for (; j < fields.length; j++) {
-		Field field = fields[j];
+		JNIField field = fields[j];
 		int mods = field.getModifiers();
 		if ((mods & Modifier.PUBLIC) != 0 && (mods & Modifier.STATIC) == 0) {
 			break;
@@ -73,12 +73,11 @@ public String getSuffix() {
 	return "_structs";
 }
 
-void generateExcludes(Class[] classes) {
+void generateExcludes(JNIClass[] classes) {
 	HashSet excludes = new HashSet();
 	for (int i = 0; i < classes.length; i++) {
-		Class clazz = classes[i];
-		ClassData classData = getMetaData().getMetaData(clazz);
-		String exclude = classData.getExclude();
+		JNIClass clazz = classes[i];
+		String exclude = clazz.getExclude();
 		if (exclude.length() != 0) {
 			excludes.add(exclude);
 		}
@@ -87,12 +86,11 @@ void generateExcludes(Class[] classes) {
 		String exclude = (String)iter.next();
 		outputln(exclude);
 		for (int i = 0; i < classes.length; i++) {
-			Class clazz = classes[i];
-			ClassData classData = getMetaData().getMetaData(clazz);
-			String classExclude = classData.getExclude();
+			JNIClass clazz = classes[i];
+			String classExclude = clazz.getExclude();
 			if (exclude.equals(classExclude)) {
 				output("#define NO_");
-				outputln(getClassName(clazz));
+				outputln(clazz.getSimpleName());
 			}
 		}
 		outputln("#endif");
@@ -100,7 +98,7 @@ void generateExcludes(Class[] classes) {
 	}
 }
 
-void generateHeaderFile(Class clazz) {
+void generateHeaderFile(JNIClass clazz) {
 	generateSourceStart(clazz);
 	generatePrototypes(clazz);
 	generateBlankMacros(clazz);
@@ -108,7 +106,7 @@ void generateHeaderFile(Class clazz) {
 	outputln();
 }
 
-void generateSourceFile(Class clazz) {
+void generateSourceFile(JNIClass clazz) {
 	generateSourceStart(clazz);
 	generateFIDsStructure(clazz);
 	outputln();
@@ -119,26 +117,26 @@ void generateSourceFile(Class clazz) {
 	outputln();
 }
 
-void generateSourceStart(Class clazz) {
-	String clazzName = getClassName(clazz);
+void generateSourceStart(JNIClass clazz) {
+	String clazzName = clazz.getSimpleName();
 	output("#ifndef NO_");
 	outputln(clazzName);
 }
 
-void generateSourceEnd(Class clazz) {
+void generateSourceEnd(JNIClass clazz) {
 	outputln("#endif");
 }
 
-void generateGlobalVar(Class clazz) {
-	String clazzName = getClassName(clazz);
+void generateGlobalVar(JNIClass clazz) {
+	String clazzName = clazz.getSimpleName();
 	output(clazzName);
 	output("_FID_CACHE ");
 	output(clazzName);
 	outputln("Fc;");
 }
 
-void generateBlankMacros(Class clazz) {
-	String clazzName = getClassName(clazz);
+void generateBlankMacros(JNIClass clazz) {
+	String clazzName = clazz.getSimpleName();
 	outputln("#else");
 	output("#define cache");
 	output(clazzName);
@@ -154,20 +152,19 @@ void generateBlankMacros(Class clazz) {
 	outputln("_sizeof() 0");
 }
 
-void generatePrototypes(Class clazz) {
-	String clazzName = getClassName(clazz);
-	ClassData classData = metaData.getMetaData(clazz);
+void generatePrototypes(JNIClass clazz) {
+	String clazzName = clazz.getSimpleName();
 	output("void cache");
 	output(clazzName);
 	outputln("Fields(JNIEnv *env, jobject lpObject);");
-	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+	if (clazz.getFlag(Flags.FLAG_STRUCT)) {
 		output("struct ");
 	}
 	output(clazzName);
 	output(" *get");
 	output(clazzName);
 	output("Fields(JNIEnv *env, jobject lpObject, ");
-	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+	if (clazz.getFlag(Flags.FLAG_STRUCT)) {
 		output("struct ");
 	}
 	output(clazzName);
@@ -175,7 +172,7 @@ void generatePrototypes(Class clazz) {
 	output("void set");
 	output(clazzName);
 	output("Fields(JNIEnv *env, jobject lpObject, ");
-	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+	if (clazz.getFlag(Flags.FLAG_STRUCT)) {
 		output("struct ");
 	}
 	output(clazzName);
@@ -183,25 +180,25 @@ void generatePrototypes(Class clazz) {
 	output("#define ");
 	output(clazzName);
 	output("_sizeof() sizeof(");
-	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+	if (clazz.getFlag(Flags.FLAG_STRUCT)) {
 		output("struct ");
 	}
 	output(clazzName);
 	outputln(")");
 }
 
-void generateFIDsStructure(Class clazz) {
-	String clazzName = getClassName(clazz);
+void generateFIDsStructure(JNIClass clazz) {
+	String clazzName = clazz.getSimpleName();
 	output("typedef struct ");
 	output(clazzName);
 	outputln("_FID_CACHE {");
 	outputln("\tint cached;");
 	outputln("\tjclass clazz;");
 	output("\tjfieldID ");
-	Field[] fields = clazz.getDeclaredFields();
+	JNIField[] fields = clazz.getDeclaredFields();
 	boolean first = true;
 	for (int i = 0; i < fields.length; i++) {
-		Field field = fields[i];
+		JNIField field = fields[i];
 		if (ignoreField(field)) continue;
 		if (!first) output(", ");
 		output(field.getName());
@@ -213,8 +210,8 @@ void generateFIDsStructure(Class clazz) {
 	outputln("_FID_CACHE;");
 }
 
-void generateCacheFunction(Class clazz) {
-	String clazzName = getClassName(clazz);
+void generateCacheFunction(JNIClass clazz) {
+	String clazzName = clazz.getSimpleName();
 	output("void cache");
 	output(clazzName);
 	outputln("Fields(JNIEnv *env, jobject lpObject)");
@@ -222,9 +219,9 @@ void generateCacheFunction(Class clazz) {
 	output("\tif (");
 	output(clazzName);
 	outputln("Fc.cached) return;");
-	Class superclazz = clazz.getSuperclass();
-	if (superclazz != Object.class) {
-		String superName = getClassName(superclazz);
+	JNIClass superclazz = clazz.getSuperclass();
+	if (!superclazz.getName().equals("java.lang.Object")) {
+		String superName = superclazz.getSimpleName();
 		output("\tcache");
 		output(superName);
 		outputln("Fields(env, lpObject);");
@@ -245,9 +242,9 @@ void generateCacheFunction(Class clazz) {
 		}
 	}
 	outputln();
-	Field[] fields = clazz.getDeclaredFields();
+	JNIField[] fields = clazz.getDeclaredFields();
 	for (int i = 0; i < fields.length; i++) {
-		Field field = fields[i];
+		JNIField field = fields[i];
 		if (ignoreField(field)) continue;
 		output("\t");
 		output(clazzName);
@@ -261,9 +258,12 @@ void generateCacheFunction(Class clazz) {
 		output(clazzName);
 		output("Fc.clazz, \"");
 		output(field.getName());
-		output("\", \"");
-		output(getTypeSignature(field.getType()));
-		outputln("\");");
+		JNIType type = field.getType(), type64 = field.getType64();
+		output("\", ");
+		if (type.equals(type64)) output("\"");
+		output(type.getTypeSignature(!type.equals(type64)));
+		if (type.equals(type64)) output("\"");
+		outputln(");");
 	}
 	output("\t");
 	output(clazzName);
@@ -271,11 +271,11 @@ void generateCacheFunction(Class clazz) {
 	outputln("}");
 }
 
-void generateGetFields(Class clazz) {
-	Class superclazz = clazz.getSuperclass();
-	String clazzName = getClassName(clazz);
-	String superName = getClassName(superclazz);
-	if (superclazz != Object.class) {
+void generateGetFields(JNIClass clazz) {
+	JNIClass superclazz = clazz.getSuperclass();
+	String clazzName = clazz.getSimpleName();
+	String superName = superclazz.getSimpleName();
+	if (!superclazz.getName().equals("java.lang.Object")) {
 		/* Windows exception - cannot call get/set function of super class in this case */
 		if (!(clazzName.equals(superName + "A") || clazzName.equals(superName + "W"))) {
 			output("\tget");
@@ -287,57 +287,56 @@ void generateGetFields(Class clazz) {
 			generateGetFields(superclazz);
 		}
 	}
-	Field[] fields = clazz.getDeclaredFields();
+	JNIField[] fields = clazz.getDeclaredFields();
 	for (int i = 0; i < fields.length; i++) {
-		Field field = fields[i];
+		JNIField field = fields[i];
 		if (ignoreField(field)) continue;
-		FieldData fieldData = getMetaData().getMetaData(field);
-		String exclude = fieldData.getExclude();
+		String exclude = field.getExclude();
 		if (exclude.length() != 0) {
 			outputln(exclude);
 		}
-		boolean noWinCE = fieldData.getFlag(FLAG_NO_WINCE);
+		boolean noWinCE = field.getFlag(FLAG_NO_WINCE);
 		if (noWinCE) {
 			outputln("#ifndef _WIN32_WCE");
 		}
-		Class type = field.getType();
-		String typeName = getClassName(type);
-		String accessor = fieldData.getAccessor();
+		JNIType type = field.getType(), type64 = field.getType64();
+		String typeName = type.getSimpleName();
+		String accessor = field.getAccessor();
 		if (accessor == null || accessor.length() == 0) accessor = field.getName();
 		if (type.isPrimitive()) {
 			output("\tlpStruct->");
 			output(accessor);
 			output(" = ");
-			output(fieldData.getCast());
+			output(field.getCast());
 			if (isCPP) {
 				output("env->Get");
 			} else {
 				output("(*env)->Get");
 			}
-			output(getTypeSignature1(field.getType()));
+			output(type.getTypeSignature1(!type.equals(type64)));
 			if (isCPP) {
 				output("Field(lpObject, ");
 			} else {
 				output("Field(env, lpObject, ");
 			}
-			output(getClassName(field.getDeclaringClass()));
+			output(field.getDeclaringClass().getSimpleName());
 			output("Fc.");
 			output(field.getName());
 			output(");");
 		} else if (type.isArray()) {
-			Class componentType = type.getComponentType();
+			JNIType componentType = type.getComponentType(), componentType64 = type64.getComponentType();
 			if (componentType.isPrimitive()) {
 				outputln("\t{");
 				output("\t");				
-				output(getTypeSignature2(field.getType()));
+				output(type.getTypeSignature2(!type.equals(type64)));
 				output(" lpObject1 = (");
-				output(getTypeSignature2(field.getType()));
+				output(type.getTypeSignature2(!type.equals(type64)));
 				if (isCPP) {
 					output(")env->GetObjectField(lpObject, ");
 				} else {
 					output(")(*env)->GetObjectField(env, lpObject, ");
 				}
-				output(getClassName(field.getDeclaringClass()));
+				output(field.getDeclaringClass().getSimpleName());
 				output("Fc.");
 				output(field.getName());
 				outputln(");");
@@ -346,7 +345,7 @@ void generateGetFields(Class clazz) {
 				} else {
 					output("\t(*env)->Get");
 				}
-				output(getTypeSignature1(componentType));
+				output(componentType.getTypeSignature1(!componentType.equals(componentType64)));
 				if (isCPP) {
 					output("ArrayRegion(lpObject1, 0, sizeof(lpStruct->");
 				} else {
@@ -354,13 +353,13 @@ void generateGetFields(Class clazz) {
 				}
 				output(accessor);
 				output(")");
-				int byteCount = getByteCount(componentType);
-				if (byteCount > 1) {
-					output(" / ");
-					output(String.valueOf(byteCount));
+				if (!componentType.isType("byte")) {
+					output(" / sizeof(");
+					output(componentType.getTypeSignature2(!componentType.equals(componentType64)));
+					output(")");
 				}
 				output(", (");
-				output(getTypeSignature4(type));				
+				output(type.getTypeSignature4(!type.equals(type64), false));				
 				output(")lpStruct->");
 				output(accessor);
 				outputln(");");
@@ -375,7 +374,7 @@ void generateGetFields(Class clazz) {
 			} else {
 				output("\tjobject lpObject1 = (*env)->GetObjectField(env, lpObject, ");
 			}
-			output(getClassName(field.getDeclaringClass()));
+			output(field.getDeclaringClass().getSimpleName());
 			output("Fc.");
 			output(field.getName());
 			outputln(");");
@@ -396,17 +395,16 @@ void generateGetFields(Class clazz) {
 	}
 }
 
-void generateGetFunction(Class clazz) {
-	String clazzName = getClassName(clazz);
-	ClassData classData = metaData.getMetaData(clazz);
-	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+void generateGetFunction(JNIClass clazz) {
+	String clazzName = clazz.getSimpleName();
+	if (clazz.getFlag(Flags.FLAG_STRUCT)) {
 		output("struct ");
 	}
 	output(clazzName);
 	output(" *get");
 	output(clazzName);
 	output("Fields(JNIEnv *env, jobject lpObject, ");
-	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+	if (clazz.getFlag(Flags.FLAG_STRUCT)) {
 		output("struct ");
 	}
 	output(clazzName);
@@ -422,11 +420,11 @@ void generateGetFunction(Class clazz) {
 	outputln("}");
 }
 
-void generateSetFields(Class clazz) {
-	Class superclazz = clazz.getSuperclass();
-	String clazzName = getClassName(clazz);
-	String superName = getClassName(superclazz);
-	if (superclazz != Object.class) {
+void generateSetFields(JNIClass clazz) {
+	JNIClass superclazz = clazz.getSuperclass();
+	String clazzName = clazz.getSimpleName();
+	String superName = superclazz.getSimpleName();
+	if (!superclazz.getName().equals("java.lang.Object")) {
 		/* Windows exception - cannot call get/set function of super class in this case */
 		if (!(clazzName.equals(superName + "A") || clazzName.equals(superName + "W"))) {
 			output("\tset");
@@ -438,22 +436,21 @@ void generateSetFields(Class clazz) {
 			generateSetFields(superclazz);
 		}
 	}
-	Field[] fields = clazz.getDeclaredFields();
+	JNIField[] fields = clazz.getDeclaredFields();
 	for (int i = 0; i < fields.length; i++) {
-		Field field = fields[i];
+		JNIField field = fields[i];
 		if (ignoreField(field)) continue;
-		FieldData fieldData = getMetaData().getMetaData(field);
-		String exclude = fieldData.getExclude();
+		String exclude = field.getExclude();
 		if (exclude.length() != 0) {
 			outputln(exclude);
 		}
-		boolean noWinCE = fieldData.getFlag(FLAG_NO_WINCE);
+		boolean noWinCE = field.getFlag(FLAG_NO_WINCE);
 		if (noWinCE) {
 			outputln("#ifndef _WIN32_WCE");
 		}
-		Class type = field.getType();
-		String typeName = getClassName(type);
-		String accessor = fieldData.getAccessor();
+		JNIType type = field.getType(), type64 = field.getType64();
+		String typeName = type.getSimpleName();
+		String accessor = field.getAccessor();
 		if (accessor == null || accessor.length() == 0) accessor = field.getName();
 		if (type.isPrimitive()) {
 			if (isCPP) {
@@ -461,34 +458,34 @@ void generateSetFields(Class clazz) {
 			} else {
 				output("\t(*env)->Set");
 			}
-			output(getTypeSignature1(field.getType()));
+			output(type.getTypeSignature1(!type.equals(type64)));
 			if (isCPP) {
 				output("Field(lpObject, ");
 			} else {
 				output("Field(env, lpObject, ");
 			}
-			output(getClassName(field.getDeclaringClass()));
+			output(field.getDeclaringClass().getSimpleName());
 			output("Fc.");
 			output(field.getName());
 			output(", (");
-			output(getTypeSignature2(field.getType()));
+			output(type.getTypeSignature2(!type.equals(type64)));
 			output(")lpStruct->");
 			output(accessor);
 			output(");");
 		} else if (type.isArray()) {
-			Class componentType = type.getComponentType();
+			JNIType componentType = type.getComponentType(), componentType64 = type64.getComponentType();
 			if (componentType.isPrimitive()) {
 				outputln("\t{");
 				output("\t");				
-				output(getTypeSignature2(field.getType()));
+				output(type.getTypeSignature2(!type.equals(type64)));
 				output(" lpObject1 = (");
-				output(getTypeSignature2(field.getType()));
+				output(type.getTypeSignature2(!type.equals(type64)));
 				if (isCPP) {
 					output(")env->GetObjectField(lpObject, ");
 				} else {
 					output(")(*env)->GetObjectField(env, lpObject, ");
 				}
-				output(getClassName(field.getDeclaringClass()));
+				output(field.getDeclaringClass().getSimpleName());
 				output("Fc.");
 				output(field.getName());
 				outputln(");");
@@ -497,7 +494,7 @@ void generateSetFields(Class clazz) {
 				} else {
 					output("\t(*env)->Set");
 				}
-				output(getTypeSignature1(componentType));
+				output(componentType.getTypeSignature1(!componentType.equals(componentType64)));
 				if (isCPP) {
 					output("ArrayRegion(lpObject1, 0, sizeof(lpStruct->");
 				} else {
@@ -505,13 +502,13 @@ void generateSetFields(Class clazz) {
 				}
 				output(accessor);
 				output(")");
-				int byteCount = getByteCount(componentType);
-				if (byteCount > 1) {
-					output(" / ");
-					output(String.valueOf(byteCount));
+				if (!componentType.isType("byte")) {
+					output(" / sizeof(");
+					output(componentType.getTypeSignature2(!componentType.equals(componentType64)));
+					output(")");
 				}
 				output(", (");
-				output(getTypeSignature4(type));				
+				output(type.getTypeSignature4(!type.equals(type64), false));				
 				output(")lpStruct->");
 				output(accessor);
 				outputln(");");
@@ -522,7 +519,7 @@ void generateSetFields(Class clazz) {
 		} else {
 			outputln("\t{");
 			output("\tjobject lpObject1 = (*env)->GetObjectField(env, lpObject, ");
-			output(getClassName(field.getDeclaringClass()));
+			output(field.getDeclaringClass().getSimpleName());
 			output("Fc.");
 			output(field.getName());
 			outputln(");");
@@ -543,13 +540,12 @@ void generateSetFields(Class clazz) {
 	}
 }
 
-void generateSetFunction(Class clazz) {
-	String clazzName = getClassName(clazz);
+void generateSetFunction(JNIClass clazz) {
+	String clazzName = clazz.getSimpleName();
 	output("void set");
 	output(clazzName);
 	output("Fields(JNIEnv *env, jobject lpObject, ");
-	ClassData classData = metaData.getMetaData(clazz);
-	if (classData.getFlag(Flags.FLAG_STRUCT)) {
+	if (clazz.getFlag(Flags.FLAG_STRUCT)) {
 		output("struct ");
 	}
 	output(clazzName);
@@ -564,7 +560,7 @@ void generateSetFunction(Class clazz) {
 	outputln("}");
 }
 
-void generateFunctions(Class clazz) {
+void generateFunctions(JNIClass clazz) {
 	generateCacheFunction(clazz);
 	outputln();
 	generateGetFunction(clazz);
@@ -572,7 +568,7 @@ void generateFunctions(Class clazz) {
 	generateSetFunction(clazz);
 }
 
-boolean ignoreField(Field field) {
+boolean ignoreField(JNIField field) {
 	int mods = field.getModifiers();
 	return
 		((mods & Modifier.PUBLIC) == 0) ||
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.C.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.C.properties
index ccbfb4cb77..1c3e23ab6c 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.C.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.C.properties
@@ -8,8 +8,6 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-org_eclipse_swt_internal_BidiUtil=flags=no_gen
-
 org_eclipse_swt_internal_C=
 C_PTR_sizeof=
 
@@ -116,50 +114,8 @@ C_strlen=
 C_strlen_0=cast=(char *)
 
 
-org_eclipse_swt_internal_Callback=flags=no_gen
-Callback_bind=
-Callback_bind_0=
-Callback_bind_1=
-Callback_bind_2=
-Callback_bind_3=
-Callback_bind_4=
-Callback_bind_5=
-Callback_bind_6=
-Callback_bind_7=
-
-Callback_getEnabled=
-
-Callback_getEntryCount=
-
-Callback_getPlatform=
-
-Callback_reset=
-
-Callback_setEnabled=
-Callback_setEnabled_0=
-
-Callback_unbind=
-Callback_unbind_0=
-
-
-org_eclipse_swt_internal_CloneableCompatibility=flags=no_gen
-
-org_eclipse_swt_internal_Compatibility=flags=no_gen
-
-org_eclipse_swt_internal_ImageList=flags=no_gen
-
 org_eclipse_swt_internal_LONG=flags=no_gen
 LONG_value=
 
-org_eclipse_swt_internal_Library=flags=no_gen
-
 org_eclipse_swt_internal_Lock=flags=no_gen
 
-org_eclipse_swt_internal_Platform=flags=no_gen
-
-org_eclipse_swt_internal_SWTEventListener=flags=no_gen
-
-org_eclipse_swt_internal_SWTEventObject=flags=no_gen
-
-org_eclipse_swt_internal_SerializableCompatibility=flags=no_gen
-
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.cocoa.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.cocoa.OS.properties
deleted file mode 100755
index 6a1f04a43b..0000000000
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.cocoa.OS.properties
+++ /dev/null
@@ -1,1325 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-org_eclipse_swt_internal_cocoa_CGPoint=
-CGPoint_x=
-CGPoint_y=
-
-org_eclipse_swt_internal_cocoa_CGRect=
-CGRect_origin=
-CGRect_size=
-
-org_eclipse_swt_internal_cocoa_CGSize=
-CGSize_width=
-CGSize_height=
-
-org_eclipse_swt_internal_cocoa_DOMDocument=
-
-org_eclipse_swt_internal_cocoa_DOMEvent=
-
-org_eclipse_swt_internal_cocoa_DOMKeyboardEvent=
-
-org_eclipse_swt_internal_cocoa_DOMMouseEvent=
-
-org_eclipse_swt_internal_cocoa_DOMUIEvent=
-
-org_eclipse_swt_internal_cocoa_DOMWheelEvent=
-
-org_eclipse_swt_internal_cocoa_NSActionCell=
-
-org_eclipse_swt_internal_cocoa_NSAffineTransform=
-
-org_eclipse_swt_internal_cocoa_NSAffineTransformStruct=
-NSAffineTransformStruct_m11=
-NSAffineTransformStruct_m12=
-NSAffineTransformStruct_m21=
-NSAffineTransformStruct_m22=
-NSAffineTransformStruct_tX=
-NSAffineTransformStruct_tY=
-
-org_eclipse_swt_internal_cocoa_NSAlert=
-
-org_eclipse_swt_internal_cocoa_NSAppleEventDescriptor=
-
-org_eclipse_swt_internal_cocoa_NSApplication=flags=no_gen
-
-org_eclipse_swt_internal_cocoa_NSArray=
-
-org_eclipse_swt_internal_cocoa_NSAttributedString=
-
-org_eclipse_swt_internal_cocoa_NSAutoreleasePool=flags=no_gen
-
-org_eclipse_swt_internal_cocoa_NSBezierPath=
-
-org_eclipse_swt_internal_cocoa_NSBitmapImageRep=
-
-org_eclipse_swt_internal_cocoa_NSBox=
-
-org_eclipse_swt_internal_cocoa_NSBrowserCell=
-
-org_eclipse_swt_internal_cocoa_NSBundle=
-
-org_eclipse_swt_internal_cocoa_NSButton=
-
-org_eclipse_swt_internal_cocoa_NSButtonCell=
-
-org_eclipse_swt_internal_cocoa_NSCalendarDate=
-
-org_eclipse_swt_internal_cocoa_NSCell=
-
-org_eclipse_swt_internal_cocoa_NSClipView=
-
-org_eclipse_swt_internal_cocoa_NSCoder=
-
-org_eclipse_swt_internal_cocoa_NSColor=
-
-org_eclipse_swt_internal_cocoa_NSColorPanel=
-
-org_eclipse_swt_internal_cocoa_NSColorSpace=
-
-org_eclipse_swt_internal_cocoa_NSComboBox=
-
-org_eclipse_swt_internal_cocoa_NSControl=
-
-org_eclipse_swt_internal_cocoa_NSCursor=
-
-org_eclipse_swt_internal_cocoa_NSData=
-
-org_eclipse_swt_internal_cocoa_NSDate=
-
-org_eclipse_swt_internal_cocoa_NSDatePicker=
-
-org_eclipse_swt_internal_cocoa_NSDictionary=
-
-org_eclipse_swt_internal_cocoa_NSDirectoryEnumerator=
-
-org_eclipse_swt_internal_cocoa_NSEnumerator=
-
-org_eclipse_swt_internal_cocoa_NSError=
-
-org_eclipse_swt_internal_cocoa_NSEvent=
-
-org_eclipse_swt_internal_cocoa_NSFileManager=
-
-org_eclipse_swt_internal_cocoa_NSFont=
-
-org_eclipse_swt_internal_cocoa_NSFontManager=
-
-org_eclipse_swt_internal_cocoa_NSFontPanel=
-
-org_eclipse_swt_internal_cocoa_NSGradient=
-
-org_eclipse_swt_internal_cocoa_NSGraphicsContext=
-
-org_eclipse_swt_internal_cocoa_NSHTTPCookie=
-
-org_eclipse_swt_internal_cocoa_NSHTTPCookieStorage=
-
-org_eclipse_swt_internal_cocoa_NSImage=
-
-org_eclipse_swt_internal_cocoa_NSImageRep=
-
-org_eclipse_swt_internal_cocoa_NSImageView=
-
-org_eclipse_swt_internal_cocoa_NSIndexSet=
-
-org_eclipse_swt_internal_cocoa_NSInputManager=
-
-org_eclipse_swt_internal_cocoa_NSKeyedArchiver=
-
-org_eclipse_swt_internal_cocoa_NSKeyedUnarchiver=
-
-org_eclipse_swt_internal_cocoa_NSLayoutManager=
-
-org_eclipse_swt_internal_cocoa_NSMenu=
-
-org_eclipse_swt_internal_cocoa_NSMenuItem=
-
-org_eclipse_swt_internal_cocoa_NSMutableArray=
-
-org_eclipse_swt_internal_cocoa_NSMutableAttributedString=
-
-org_eclipse_swt_internal_cocoa_NSMutableDictionary=
-
-org_eclipse_swt_internal_cocoa_NSMutableIndexSet=
-
-org_eclipse_swt_internal_cocoa_NSMutableParagraphStyle=
-
-org_eclipse_swt_internal_cocoa_NSMutableSet=
-
-org_eclipse_swt_internal_cocoa_NSMutableString=
-
-org_eclipse_swt_internal_cocoa_NSMutableURLRequest=
-
-org_eclipse_swt_internal_cocoa_NSNotification=
-
-org_eclipse_swt_internal_cocoa_NSNotificationCenter=
-
-org_eclipse_swt_internal_cocoa_NSNumber=
-
-org_eclipse_swt_internal_cocoa_NSObject=flags=no_gen
-
-org_eclipse_swt_internal_cocoa_NSOpenGLContext=
-
-org_eclipse_swt_internal_cocoa_NSOpenGLPixelFormat=
-
-org_eclipse_swt_internal_cocoa_NSOpenGLView=
-
-org_eclipse_swt_internal_cocoa_NSOpenPanel=
-
-org_eclipse_swt_internal_cocoa_NSOutlineView=
-
-org_eclipse_swt_internal_cocoa_NSPanel=
-
-org_eclipse_swt_internal_cocoa_NSParagraphStyle=
-
-org_eclipse_swt_internal_cocoa_NSPasteboard=
-
-org_eclipse_swt_internal_cocoa_NSPoint=
-NSPoint_x=
-NSPoint_y=
-
-org_eclipse_swt_internal_cocoa_NSPopUpButton=
-
-org_eclipse_swt_internal_cocoa_NSPrintInfo=
-
-org_eclipse_swt_internal_cocoa_NSPrintOperation=
-
-org_eclipse_swt_internal_cocoa_NSPrintPanel=
-
-org_eclipse_swt_internal_cocoa_NSPrinter=
-
-org_eclipse_swt_internal_cocoa_NSProgressIndicator=
-
-org_eclipse_swt_internal_cocoa_NSRange=
-NSRange_location=
-NSRange_length=
-
-org_eclipse_swt_internal_cocoa_NSRect=
-NSRect_x=accessor=origin.x
-NSRect_y=accessor=origin.y
-NSRect_width=accessor=size.width
-NSRect_height=accessor=size.height
-
-org_eclipse_swt_internal_cocoa_NSResponder=
-
-org_eclipse_swt_internal_cocoa_NSRunLoop=
-
-org_eclipse_swt_internal_cocoa_NSSavePanel=
-
-org_eclipse_swt_internal_cocoa_NSScreen=
-
-org_eclipse_swt_internal_cocoa_NSScrollView=
-
-org_eclipse_swt_internal_cocoa_NSScroller=
-
-org_eclipse_swt_internal_cocoa_NSSearchField=
-
-org_eclipse_swt_internal_cocoa_NSSecureTextField=
-
-org_eclipse_swt_internal_cocoa_NSSet=
-
-org_eclipse_swt_internal_cocoa_NSSize=
-NSSize_width=
-NSSize_height=
-
-org_eclipse_swt_internal_cocoa_NSSlider=
-
-org_eclipse_swt_internal_cocoa_NSStatusBar=
-
-org_eclipse_swt_internal_cocoa_NSStatusItem=
-
-org_eclipse_swt_internal_cocoa_NSStepper=
-
-org_eclipse_swt_internal_cocoa_NSString=
-
-org_eclipse_swt_internal_cocoa_NSTabView=
-
-org_eclipse_swt_internal_cocoa_NSTabViewItem=
-
-org_eclipse_swt_internal_cocoa_NSTableColumn=
-
-org_eclipse_swt_internal_cocoa_NSTableHeaderCell=
-
-org_eclipse_swt_internal_cocoa_NSTableHeaderView=
-
-org_eclipse_swt_internal_cocoa_NSTableView=
-
-org_eclipse_swt_internal_cocoa_NSText=
-
-org_eclipse_swt_internal_cocoa_NSTextContainer=
-
-org_eclipse_swt_internal_cocoa_NSTextField=
-
-org_eclipse_swt_internal_cocoa_NSTextFieldCell=
-
-org_eclipse_swt_internal_cocoa_NSTextStorage=
-
-org_eclipse_swt_internal_cocoa_NSTextView=
-
-org_eclipse_swt_internal_cocoa_NSTimeZone=
-
-org_eclipse_swt_internal_cocoa_NSTimer=
-
-org_eclipse_swt_internal_cocoa_NSTypesetter=
-
-org_eclipse_swt_internal_cocoa_NSURL=
-
-org_eclipse_swt_internal_cocoa_NSURLDownload=
-
-org_eclipse_swt_internal_cocoa_NSURLRequest=
-
-org_eclipse_swt_internal_cocoa_NSValue=
-
-org_eclipse_swt_internal_cocoa_NSView=
-
-org_eclipse_swt_internal_cocoa_NSWindow=flags=no_gen
-
-org_eclipse_swt_internal_cocoa_NSWorkspace=
-
-org_eclipse_swt_internal_cocoa_OS=
-OS_CGPoint_sizeof=
-
-OS_CGRect_sizeof=
-
-OS_CGSize_sizeof=
-
-OS_CGWarpMouseCursorPosition=
-OS_CGWarpMouseCursorPosition_0=flags=struct
-
-OS_CPSSetProcessName=
-OS_CPSSetProcessName_0=
-OS_CPSSetProcessName_1=
-
-OS_CloseRgn=flags=dynamic
-OS_CloseRgn_0=
-
-OS_CopyRgn=flags=dynamic
-OS_CopyRgn_0=
-OS_CopyRgn_1=
-
-OS_DeleteGlobalRef=flags=jni
-OS_DeleteGlobalRef_0=cast=(jobject)
-
-OS_DiffRgn=flags=dynamic
-OS_DiffRgn_0=
-OS_DiffRgn_1=
-OS_DiffRgn_2=
-
-OS_DisposeRgn=flags=dynamic
-OS_DisposeRgn_0=
-
-OS_EmptyRgn=flags=dynamic
-OS_EmptyRgn_0=
-
-OS_Gestalt=
-OS_Gestalt_0=
-OS_Gestalt_1=
-
-OS_GetCurrentProcess=
-OS_GetCurrentProcess_0=cast=(ProcessSerialNumber *)
-
-OS_GetRegionBounds=flags=dynamic
-OS_GetRegionBounds_0=
-OS_GetRegionBounds_1=
-
-OS_JNIGetObject=flags=no_gen
-OS_JNIGetObject_0=
-
-OS_LineTo=flags=dynamic
-OS_LineTo_0=
-OS_LineTo_1=
-
-OS_MoveTo=flags=dynamic
-OS_MoveTo_0=
-OS_MoveTo_1=
-
-OS_NSAccessibilityPositionAttribute=flags=const
-
-OS_NSAccessibilitySizeAttribute=flags=const
-
-OS_NSAffineTransformStruct_sizeof=
-
-OS_NSBackgroundColorAttributeName=flags=const
-
-OS_NSBaselineOffsetAttributeName=flags=const
-
-OS_NSBitsPerPixelFromDepth=
-OS_NSBitsPerPixelFromDepth_0=
-
-OS_NSCalibratedRGBColorSpace=flags=const
-
-OS_NSDefaultRunLoopMode=flags=const
-
-OS_NSDeviceRGBColorSpace=flags=const
-
-OS_NSDeviceResolution=flags=const
-
-OS_NSErrorFailingURLStringKey=flags=const
-
-OS_NSFileTypeForHFSTypeCode=
-OS_NSFileTypeForHFSTypeCode_0=
-
-OS_NSFilenamesPboardType=flags=const
-
-OS_NSFontAttributeName=flags=const
-
-OS_NSForegroundColorAttributeName=flags=const
-
-OS_NSGetSizeAndAlignment=
-OS_NSGetSizeAndAlignment_0=cast=(char*)
-OS_NSGetSizeAndAlignment_1=cast=(NSUInteger*)
-OS_NSGetSizeAndAlignment_2=cast=(NSUInteger*)
-
-OS_NSIntersectionRect=flags=no_gen
-OS_NSIntersectionRect_0=
-OS_NSIntersectionRect_1=
-OS_NSIntersectionRect_2=
-
-OS_NSLinkAttributeName=flags=const
-
-OS_NSParagraphStyleAttributeName=flags=const
-
-OS_NSPoint_sizeof=
-
-OS_NSPrintAllPages=flags=const
-
-OS_NSPrintCopies=flags=const
-
-OS_NSPrintFirstPage=flags=const
-
-OS_NSPrintJobDisposition=flags=const
-
-OS_NSPrintLastPage=flags=const
-
-OS_NSPrintMustCollate=flags=const
-
-OS_NSPrintPreviewJob=flags=const
-
-OS_NSPrintSaveJob=flags=const
-
-OS_NSPrintSavePath=flags=const
-
-OS_NSPrintSpoolJob=flags=const
-
-OS_NSRTFPboardType=flags=const
-
-OS_NSRange_sizeof=
-
-OS_NSRect_sizeof=
-
-OS_NSSearchPathForDirectoriesInDomains=
-OS_NSSearchPathForDirectoriesInDomains_0=
-OS_NSSearchPathForDirectoriesInDomains_1=
-OS_NSSearchPathForDirectoriesInDomains_2=
-
-OS_NSSize_sizeof=
-
-OS_NSStrikethroughColorAttributeName=flags=const
-
-OS_NSStrikethroughStyleAttributeName=flags=const
-
-OS_NSStringPboardType=flags=const
-
-OS_NSTIFFPboardType=flags=const
-
-OS_NSTemporaryDirectory=
-
-OS_NSURLPboardType=flags=const
-
-OS_NSUnderlineColorAttributeName=flags=const
-
-OS_NSUnderlineStyleAttributeName=flags=const
-
-OS_NewGlobalRef=flags=jni
-OS_NewGlobalRef_0=cast=(jobject)
-
-OS_NewRgn=flags=dynamic
-
-OS_OffsetRgn=flags=dynamic
-OS_OffsetRgn_0=
-OS_OffsetRgn_1=
-OS_OffsetRgn_2=
-
-OS_OpenRgn=flags=dynamic
-
-OS_PtInRgn=flags=dynamic
-OS_PtInRgn_0=
-OS_PtInRgn_1=
-
-OS_QDRegionToRects=flags=dynamic
-OS_QDRegionToRects_0=
-OS_QDRegionToRects_1=
-OS_QDRegionToRects_2=
-OS_QDRegionToRects_3=
-
-OS_RectInRgn=flags=dynamic
-OS_RectInRgn_0=
-OS_RectInRgn_1=
-
-OS_RectRgn=flags=dynamic
-OS_RectRgn_0=
-OS_RectRgn_1=
-
-OS_SectRgn=flags=dynamic
-OS_SectRgn_0=
-OS_SectRgn_1=
-OS_SectRgn_2=
-
-OS_SetFrontProcess=
-OS_SetFrontProcess_0=cast=(ProcessSerialNumber *)
-
-OS_SetRect=flags=dynamic
-OS_SetRect_0=
-OS_SetRect_1=
-OS_SetRect_2=
-OS_SetRect_3=
-OS_SetRect_4=
-
-OS_TransformProcessType=
-OS_TransformProcessType_0=cast=(ProcessSerialNumber *)
-OS_TransformProcessType_1=
-
-OS_UnionRgn=flags=dynamic
-OS_UnionRgn_0=
-OS_UnionRgn_1=
-OS_UnionRgn_2=
-
-OS_attributedSubstringFromRange_CALLBACK=flags=no_gen
-OS_attributedSubstringFromRange_CALLBACK_0=
-
-OS_characterIndexForPoint_CALLBACK=flags=no_gen
-OS_characterIndexForPoint_CALLBACK_0=
-
-OS_class_addIvar=
-OS_class_addIvar_0=cast=(Class)
-OS_class_addIvar_1=cast=(const char *)
-OS_class_addIvar_2=cast=(size_t)
-OS_class_addIvar_3=
-OS_class_addIvar_4=cast=(const char *)
-
-OS_class_addMethod=
-OS_class_addMethod_0=cast=(Class)
-OS_class_addMethod_1=cast=(SEL)
-OS_class_addMethod_2=cast=(IMP)
-OS_class_addMethod_3=cast=(const char *)
-
-OS_class_addProtocol=
-OS_class_addProtocol_0=cast=Class
-OS_class_addProtocol_1=cast=Protocol *
-
-OS_drawInteriorWithFrame_inView_CALLBACK=flags=no_gen
-OS_drawInteriorWithFrame_inView_CALLBACK_0=
-
-OS_drawRect_CALLBACK=flags=no_gen
-OS_drawRect_CALLBACK_0=
-
-OS_firstRectForCharacterRange_CALLBACK=flags=no_gen
-OS_firstRectForCharacterRange_CALLBACK_0=
-
-OS_getpid=
-
-OS_hitTest_CALLBACK=flags=no_gen
-OS_hitTest_CALLBACK_0=
-
-OS_instrumentObjcMessageSends=flags=dynamic
-OS_instrumentObjcMessageSends_0=
-
-OS_markedRange_CALLBACK=flags=no_gen
-OS_markedRange_CALLBACK_0=
-
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I=
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I_0=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I_1=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I_2=
-
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I=
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I_0=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I_1=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I_2=
-
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I=
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I_0=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I_1=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I_2=
-
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I=
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I_0=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I_1=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I_2=
-
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I=
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I_0=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I_1=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I_2=
-
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I=
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I_0=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I_1=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I_2=
-
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I=
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I_0=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I_1=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I_2=
-
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I=
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I_0=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I_1=cast=(void *)
-OS_memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I_2=
-
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II=
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II_0=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II_1=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II_2=
-
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II=
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II_0=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II_1=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II_2=
-
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II=
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II_0=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II_1=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II_2=
-
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II=
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_0=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_1=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_2=
-
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II=
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_0=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_1=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_2=
-
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II=
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_0=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_1=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_2=
-
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II=
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_0=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_1=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_2=
-
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II=
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_0=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_1=cast=(void *)
-OS_memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_2=
-
-OS_objc_allocateClassPair=
-OS_objc_allocateClassPair_0=cast=(Class)
-OS_objc_allocateClassPair_1=cast=(const char *)
-OS_objc_allocateClassPair_2=cast=(size_t)
-
-OS_objc_getClass=
-OS_objc_getClass_0=cast=(const char *)
-
-OS_objc_getProtocol=
-OS_objc_getProtocol_0=
-
-OS_objc_lookUpClass=
-OS_objc_lookUpClass_0=cast=(const char *)
-
-OS_objc_1msgSend__II=flags=cast
-OS_objc_1msgSend__II_0=cast=(id)
-OS_objc_1msgSend__II_1=cast=(SEL)
-
-OS_objc_1msgSend__IID=flags=cast
-OS_objc_1msgSend__IID_0=cast=(id)
-OS_objc_1msgSend__IID_1=cast=(SEL)
-OS_objc_1msgSend__IID_2=
-
-OS_objc_1msgSend__IIDIIIZ=flags=cast
-OS_objc_1msgSend__IIDIIIZ_0=cast=(id)
-OS_objc_1msgSend__IIDIIIZ_1=cast=(SEL)
-OS_objc_1msgSend__IIDIIIZ_2=
-OS_objc_1msgSend__IIDIIIZ_3=
-OS_objc_1msgSend__IIDIIIZ_4=
-OS_objc_1msgSend__IIDIIIZ_5=
-OS_objc_1msgSend__IIDIIIZ_6=
-
-OS_objc_1msgSend__IIF=flags=cast
-OS_objc_1msgSend__IIF_0=cast=(id)
-OS_objc_1msgSend__IIF_1=cast=(SEL)
-OS_objc_1msgSend__IIF_2=
-
-OS_objc_1msgSend__IIFF=flags=cast
-OS_objc_1msgSend__IIFF_0=cast=(id)
-OS_objc_1msgSend__IIFF_1=cast=(SEL)
-OS_objc_1msgSend__IIFF_2=
-OS_objc_1msgSend__IIFF_3=
-
-OS_objc_1msgSend__IIFFFF=flags=cast
-OS_objc_1msgSend__IIFFFF_0=cast=(id)
-OS_objc_1msgSend__IIFFFF_1=cast=(SEL)
-OS_objc_1msgSend__IIFFFF_2=
-OS_objc_1msgSend__IIFFFF_3=
-OS_objc_1msgSend__IIFFFF_4=
-OS_objc_1msgSend__IIFFFF_5=
-
-OS_objc_1msgSend__III=flags=cast
-OS_objc_1msgSend__III_0=cast=(id)
-OS_objc_1msgSend__III_1=cast=(SEL)
-OS_objc_1msgSend__III_2=
-
-OS_objc_1msgSend__IIIF=flags=cast
-OS_objc_1msgSend__IIIF_0=cast=(id)
-OS_objc_1msgSend__IIIF_1=cast=(SEL)
-OS_objc_1msgSend__IIIF_2=
-OS_objc_1msgSend__IIIF_3=
-
-OS_objc_1msgSend__IIII=flags=cast
-OS_objc_1msgSend__IIII_0=cast=(id)
-OS_objc_1msgSend__IIII_1=cast=(SEL)
-OS_objc_1msgSend__IIII_2=
-OS_objc_1msgSend__IIII_3=
-
-OS_objc_1msgSend__IIIII=flags=cast
-OS_objc_1msgSend__IIIII_0=cast=(id)
-OS_objc_1msgSend__IIIII_1=cast=(SEL)
-OS_objc_1msgSend__IIIII_2=
-OS_objc_1msgSend__IIIII_3=
-OS_objc_1msgSend__IIIII_4=
-
-OS_objc_1msgSend__IIIIII=flags=cast
-OS_objc_1msgSend__IIIIII_0=cast=(id)
-OS_objc_1msgSend__IIIIII_1=cast=(SEL)
-OS_objc_1msgSend__IIIIII_2=
-OS_objc_1msgSend__IIIIII_3=
-OS_objc_1msgSend__IIIIII_4=
-OS_objc_1msgSend__IIIIII_5=
-
-OS_objc_1msgSend__IIIIIII=flags=cast
-OS_objc_1msgSend__IIIIIII_0=cast=(id)
-OS_objc_1msgSend__IIIIIII_1=cast=(SEL)
-OS_objc_1msgSend__IIIIIII_2=
-OS_objc_1msgSend__IIIIIII_3=
-OS_objc_1msgSend__IIIIIII_4=
-OS_objc_1msgSend__IIIIIII_5=
-OS_objc_1msgSend__IIIIIII_6=
-
-OS_objc_1msgSend__IIIIIIIII=flags=cast
-OS_objc_1msgSend__IIIIIIIII_0=cast=(id)
-OS_objc_1msgSend__IIIIIIIII_1=cast=(SEL)
-OS_objc_1msgSend__IIIIIIIII_2=
-OS_objc_1msgSend__IIIIIIIII_3=
-OS_objc_1msgSend__IIIIIIIII_4=
-OS_objc_1msgSend__IIIIIIIII_5=
-OS_objc_1msgSend__IIIIIIIII_6=
-OS_objc_1msgSend__IIIIIIIII_7=
-OS_objc_1msgSend__IIIIIIIII_8=
-
-OS_objc_1msgSend__IIIIIIIZZIII=flags=cast
-OS_objc_1msgSend__IIIIIIIZZIII_0=cast=(id)
-OS_objc_1msgSend__IIIIIIIZZIII_1=cast=(SEL)
-OS_objc_1msgSend__IIIIIIIZZIII_2=
-OS_objc_1msgSend__IIIIIIIZZIII_3=
-OS_objc_1msgSend__IIIIIIIZZIII_4=
-OS_objc_1msgSend__IIIIIIIZZIII_5=
-OS_objc_1msgSend__IIIIIIIZZIII_6=
-OS_objc_1msgSend__IIIIIIIZZIII_7=
-OS_objc_1msgSend__IIIIIIIZZIII_8=
-OS_objc_1msgSend__IIIIIIIZZIII_9=
-OS_objc_1msgSend__IIIIIIIZZIII_10=
-OS_objc_1msgSend__IIIIIIIZZIII_11=
-
-OS_objc_1msgSend__IIIIIIIZZIIII=flags=cast
-OS_objc_1msgSend__IIIIIIIZZIIII_0=cast=(id)
-OS_objc_1msgSend__IIIIIIIZZIIII_1=cast=(SEL)
-OS_objc_1msgSend__IIIIIIIZZIIII_2=
-OS_objc_1msgSend__IIIIIIIZZIIII_3=
-OS_objc_1msgSend__IIIIIIIZZIIII_4=
-OS_objc_1msgSend__IIIIIIIZZIIII_5=
-OS_objc_1msgSend__IIIIIIIZZIIII_6=
-OS_objc_1msgSend__IIIIIIIZZIIII_7=
-OS_objc_1msgSend__IIIIIIIZZIIII_8=
-OS_objc_1msgSend__IIIIIIIZZIIII_9=
-OS_objc_1msgSend__IIIIIIIZZIIII_10=
-OS_objc_1msgSend__IIIIIIIZZIIII_11=
-OS_objc_1msgSend__IIIIIIIZZIIII_12=
-
-OS_objc_1msgSend__IIIIIZ=flags=cast
-OS_objc_1msgSend__IIIIIZ_0=cast=(id)
-OS_objc_1msgSend__IIIIIZ_1=cast=(SEL)
-OS_objc_1msgSend__IIIIIZ_2=
-OS_objc_1msgSend__IIIIIZ_3=
-OS_objc_1msgSend__IIIIIZ_4=
-OS_objc_1msgSend__IIIIIZ_5=
-
-OS_objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2=flags=cast
-OS_objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2_0=cast=(id)
-OS_objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2_1=cast=(SEL)
-OS_objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2_2=
-OS_objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2_3=
-OS_objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2_4=flags=struct
-
-OS_objc_1msgSend__IIIIZ=flags=cast
-OS_objc_1msgSend__IIIIZ_0=cast=(id)
-OS_objc_1msgSend__IIIIZ_1=cast=(SEL)
-OS_objc_1msgSend__IIIIZ_2=
-OS_objc_1msgSend__IIIIZ_3=
-OS_objc_1msgSend__IIIIZ_4=
-
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2=flags=cast
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_0=cast=(id)
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_1=cast=(SEL)
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_2=
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_3=flags=struct
-
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII=flags=cast
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_0=cast=(id)
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_1=cast=(SEL)
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_2=
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_3=flags=struct
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_4=
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_5=
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_6=
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_7=
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_8=
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_9=
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_10=
-
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2=flags=cast
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2_0=cast=(id)
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2_1=cast=(SEL)
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2_2=
-OS_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2_3=flags=struct
-
-OS_objc_1msgSend__IIIZ=flags=cast
-OS_objc_1msgSend__IIIZ_0=cast=(id)
-OS_objc_1msgSend__IIIZ_1=cast=(SEL)
-OS_objc_1msgSend__IIIZ_2=
-OS_objc_1msgSend__IIIZ_3=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_2=flags=struct
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_2=flags=struct
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF_3=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF_4=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF_5=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_3=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_4=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_5=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_6=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F_3=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F_4=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I_3=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I_4=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_3=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_4=flags=struct
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_3=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_4=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_5=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2_2=flags=struct
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_3=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_3=flags=struct
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2_2=flags=struct
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F_3=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF_3=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF_4=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I_3=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II_3=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II_4=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ_3=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ_4=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ_5=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_3=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_4=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_5=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_6=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI_3=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI_4=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI_5=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_3=flags=struct
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_3=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_4=flags=struct
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_3=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_4=
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_5=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z_2=flags=struct
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z_3=
-
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2=flags=cast
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2_0=cast=(id)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2_1=cast=(SEL)
-OS_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2_2=flags=struct
-
-OS_objc_1msgSend__IIZ=flags=cast
-OS_objc_1msgSend__IIZ_0=cast=(id)
-OS_objc_1msgSend__IIZ_1=cast=(SEL)
-OS_objc_1msgSend__IIZ_2=
-
-OS_objc_1msgSend__IIZI=flags=cast
-OS_objc_1msgSend__IIZI_0=cast=(id)
-OS_objc_1msgSend__IIZI_1=cast=(SEL)
-OS_objc_1msgSend__IIZI_2=
-OS_objc_1msgSend__IIZI_3=
-
-OS_objc_1msgSend__II_3B=flags=cast
-OS_objc_1msgSend__II_3B_0=cast=(id)
-OS_objc_1msgSend__II_3B_1=cast=(SEL)
-OS_objc_1msgSend__II_3B_2=
-
-OS_objc_1msgSend__II_3BI=flags=cast
-OS_objc_1msgSend__II_3BI_0=cast=(id)
-OS_objc_1msgSend__II_3BI_1=cast=(SEL)
-OS_objc_1msgSend__II_3BI_2=
-OS_objc_1msgSend__II_3BI_3=
-
-OS_objc_1msgSend__II_3C=
-OS_objc_1msgSend__II_3C_0=cast=(id)
-OS_objc_1msgSend__II_3C_1=cast=(SEL)
-OS_objc_1msgSend__II_3C_2=
-
-OS_objc_1msgSend__II_3CI=
-OS_objc_1msgSend__II_3CI_0=cast=(id)
-OS_objc_1msgSend__II_3CI_1=cast=SEL
-OS_objc_1msgSend__II_3CI_2=
-OS_objc_1msgSend__II_3CI_3=
-
-OS_objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2=flags=cast
-OS_objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_0=cast=(id)
-OS_objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_1=cast=(SEL)
-OS_objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_2=
-OS_objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_3=flags=struct
-
-OS_objc_1msgSend__II_3F=flags=cast
-OS_objc_1msgSend__II_3F_0=cast=(id)
-OS_objc_1msgSend__II_3F_1=cast=(SEL)
-OS_objc_1msgSend__II_3F_2=
-
-OS_objc_1msgSend__II_3FIF=flags=cast
-OS_objc_1msgSend__II_3FIF_0=cast=(id)
-OS_objc_1msgSend__II_3FIF_1=cast=(SEL)
-OS_objc_1msgSend__II_3FIF_2=
-OS_objc_1msgSend__II_3FIF_3=
-OS_objc_1msgSend__II_3FIF_4=
-
-OS_objc_1msgSend__II_3I=flags=cast
-OS_objc_1msgSend__II_3I_0=cast=(id)
-OS_objc_1msgSend__II_3I_1=cast=(SEL)
-OS_objc_1msgSend__II_3I_2=
-
-OS_objc_1msgSend__II_3III=flags=cast
-OS_objc_1msgSend__II_3III_0=cast=(id)
-OS_objc_1msgSend__II_3III_1=cast=(SEL)
-OS_objc_1msgSend__II_3III_2=
-OS_objc_1msgSend__II_3III_3=
-OS_objc_1msgSend__II_3III_4=
-
-OS_objc_1msgSend__JJFD=flags=cast
-OS_objc_1msgSend__JJFD_0=cast=(id)
-OS_objc_1msgSend__JJFD_1=cast=(SEL)
-OS_objc_1msgSend__JJFD_2=
-OS_objc_1msgSend__JJFD_3=
-
-OS_objc_1msgSend__JJI=flags=cast
-OS_objc_1msgSend__JJI_0=cast=(id)
-OS_objc_1msgSend__JJI_1=cast=(SEL)
-OS_objc_1msgSend__JJI_2=
-
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I=flags=cast
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I_0=cast=(id)
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I_1=cast=(SEL)
-
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II=flags=cast
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II_0=cast=(id)
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II_1=cast=(SEL)
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II_2=
-
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ=flags=cast
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ_0=cast=(id)
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ_1=cast=(SEL)
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ_2=
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ_3=
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ_4=
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ_5=
-
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2=flags=cast
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2_0=cast=(id)
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2_1=cast=(SEL)
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2_2=flags=struct
-
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2=flags=cast
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_0=cast=(id)
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_1=cast=(SEL)
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_2=flags=struct
-
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2=flags=cast
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2_0=cast=(id)
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2_1=cast=(SEL)
-OS_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2_2=flags=struct
-
-OS_objc_1msgSend_1fpret__II=flags=cast
-OS_objc_1msgSend_1fpret__II_0=cast=(id)
-OS_objc_1msgSend_1fpret__II_1=cast=(SEL)
-
-OS_objc_1msgSend_1fpret__III=flags=cast
-OS_objc_1msgSend_1fpret__III_0=cast=(id)
-OS_objc_1msgSend_1fpret__III_1=cast=(SEL)
-OS_objc_1msgSend_1fpret__III_2=
-
-OS_objc_1msgSend_1fpret__IIII=flags=cast
-OS_objc_1msgSend_1fpret__IIII_0=cast=(id)
-OS_objc_1msgSend_1fpret__IIII_1=cast=(SEL)
-OS_objc_1msgSend_1fpret__IIII_2=
-OS_objc_1msgSend_1fpret__IIII_3=
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_2=cast=(SEL)
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_2=cast=(SEL)
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III_3=
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_3=flags=struct
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3=flags=struct
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_4=
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_2=cast=(SEL)
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III_3=
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_2=cast=(SEL)
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III_3=
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII_3=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII_4=
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ_3=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ_4=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ_5=
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_3=flags=struct
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_4=
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_3=flags=struct
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_3=flags=struct
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_4=
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_2=cast=(SEL)
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2_3=flags=struct
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_3=flags=struct
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_4=
-
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI=flags=cast
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_0=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_1=cast=(id)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_2=cast=(SEL)
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_3=flags=struct
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_4=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_5=
-OS_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_6=
-
-OS_objc_registerClassPair=
-OS_objc_registerClassPair_0=cast=(Class)
-
-OS_objc_super_sizeof=
-
-OS_object_getClassName=
-OS_object_getClassName_0=cast=(id)
-
-OS_object_getInstanceVariable=
-OS_object_getInstanceVariable_0=cast=(id)
-OS_object_getInstanceVariable_1=cast=(const char *)
-OS_object_getInstanceVariable_2=cast=(void **)
-
-OS_object_setClass=
-OS_object_setClass_0=cast=(id)
-OS_object_setClass_1=cast=(Class)
-
-OS_object_setInstanceVariable=
-OS_object_setInstanceVariable_0=cast=(id)
-OS_object_setInstanceVariable_1=cast=(const char *)
-OS_object_setInstanceVariable_2=cast=(void *)
-
-OS_sel_registerName=
-OS_sel_registerName_0=cast=(const char *)
-
-OS_selectedRange_CALLBACK=flags=no_gen
-OS_selectedRange_CALLBACK_0=
-
-OS_setFrameOrigin_CALLBACK=flags=no_gen
-OS_setFrameOrigin_CALLBACK_0=
-
-OS_setFrameSize_CALLBACK=flags=no_gen
-OS_setFrameSize_CALLBACK_0=
-
-OS_setFrame_CALLBACK=flags=no_gen
-OS_setFrame_CALLBACK_0=
-
-OS_setMarkedText_selectedRange_CALLBACK=flags=no_gen
-OS_setMarkedText_selectedRange_CALLBACK_0=
-
-OS_textView_willChangeSelectionFromCharacterRange_toCharacterRange_CALLBACK=flags=no_gen
-OS_textView_willChangeSelectionFromCharacterRange_toCharacterRange_CALLBACK_0=
-
-OS_webView_setFrame_CALLBACK=flags=no_gen
-OS_webView_setFrame_CALLBACK_0=
-
-
-org_eclipse_swt_internal_cocoa_Protocol=
-
-org_eclipse_swt_internal_cocoa_SWTApplicationDelegate=
-
-org_eclipse_swt_internal_cocoa_SWTBox=
-
-org_eclipse_swt_internal_cocoa_SWTButton=
-
-org_eclipse_swt_internal_cocoa_SWTComboBox=
-
-org_eclipse_swt_internal_cocoa_SWTDatePicker=
-
-org_eclipse_swt_internal_cocoa_SWTImageView=
-
-org_eclipse_swt_internal_cocoa_SWTMenu=
-
-org_eclipse_swt_internal_cocoa_SWTMenuItem=
-
-org_eclipse_swt_internal_cocoa_SWTOutlineView=
-
-org_eclipse_swt_internal_cocoa_SWTPanelDelegate=
-
-org_eclipse_swt_internal_cocoa_SWTPopUpButton=
-
-org_eclipse_swt_internal_cocoa_SWTProgressIndicator=
-
-org_eclipse_swt_internal_cocoa_SWTScrollView=
-
-org_eclipse_swt_internal_cocoa_SWTScroller=
-
-org_eclipse_swt_internal_cocoa_SWTSearchField=
-
-org_eclipse_swt_internal_cocoa_SWTSecureTextField=
-
-org_eclipse_swt_internal_cocoa_SWTSlider=
-
-org_eclipse_swt_internal_cocoa_SWTStepper=
-
-org_eclipse_swt_internal_cocoa_SWTTabView=
-
-org_eclipse_swt_internal_cocoa_SWTTableHeaderCell=
-
-org_eclipse_swt_internal_cocoa_SWTTableView=
-
-org_eclipse_swt_internal_cocoa_SWTTextField=
-
-org_eclipse_swt_internal_cocoa_SWTTextView=
-
-org_eclipse_swt_internal_cocoa_SWTTreeItem=
-
-org_eclipse_swt_internal_cocoa_SWTView=
-
-org_eclipse_swt_internal_cocoa_SWTWebViewDelegate=
-
-org_eclipse_swt_internal_cocoa_SWTWindow=
-
-org_eclipse_swt_internal_cocoa_SWTWindowDelegate=
-
-org_eclipse_swt_internal_cocoa_WebDataSource=
-
-org_eclipse_swt_internal_cocoa_WebDocumentRepresentation=
-
-org_eclipse_swt_internal_cocoa_WebFrame=
-
-org_eclipse_swt_internal_cocoa_WebFrameView=
-
-org_eclipse_swt_internal_cocoa_WebOpenPanelResultListener=
-
-org_eclipse_swt_internal_cocoa_WebPolicyDecisionListener=
-
-org_eclipse_swt_internal_cocoa_WebPreferences=
-
-org_eclipse_swt_internal_cocoa_WebView=
-
-org_eclipse_swt_internal_cocoa_id=flags=no_gen
-id_id=
-
-org_eclipse_swt_internal_cocoa_objc_1super=flags=struct
-objc_super_receiver=cast=(id)
-objc_super_super_class=cast=(Class)
-
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties
index cf70023b18..45d2dcde49 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gdip.Gdip.properties
@@ -265,15 +265,15 @@ Gdip_Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II_
 Gdip_Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II_6=
 Gdip_Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II_7=cast=const Matrix *
 
-Gdip_Graphics_1DrawDriverString__IIIII_3FII=flags=no_gen
-Gdip_Graphics_1DrawDriverString__IIIII_3FII_0=
-Gdip_Graphics_1DrawDriverString__IIIII_3FII_1=
+Gdip_Graphics_1DrawDriverString__IIIII_3FII=flags=no_gen cpp
+Gdip_Graphics_1DrawDriverString__IIIII_3FII_0=cast=(Graphics *)
+Gdip_Graphics_1DrawDriverString__IIIII_3FII_1=cast=(const UINT16 *)
 Gdip_Graphics_1DrawDriverString__IIIII_3FII_2=
-Gdip_Graphics_1DrawDriverString__IIIII_3FII_3=
-Gdip_Graphics_1DrawDriverString__IIIII_3FII_4=
-Gdip_Graphics_1DrawDriverString__IIIII_3FII_5=
+Gdip_Graphics_1DrawDriverString__IIIII_3FII_3=cast=const Font *
+Gdip_Graphics_1DrawDriverString__IIIII_3FII_4=cast=const Brush *
+Gdip_Graphics_1DrawDriverString__IIIII_3FII_5=cast=const PointF *
 Gdip_Graphics_1DrawDriverString__IIIII_3FII_6=
-Gdip_Graphics_1DrawDriverString__IIIII_3FII_7=
+Gdip_Graphics_1DrawDriverString__IIIII_3FII_7=cast=const Matrix *
 
 Gdip_Graphics_DrawEllipse=flags=cpp
 Gdip_Graphics_DrawEllipse_0=cast=(Graphics *)
@@ -426,6 +426,16 @@ Gdip_Graphics_GetVisibleClipBounds=flags=cpp
 Gdip_Graphics_GetVisibleClipBounds_0=cast=(Graphics *)
 Gdip_Graphics_GetVisibleClipBounds_1=
 
+Gdip_Graphics_MeasureDriverString=flags=no_gen
+Gdip_Graphics_MeasureDriverString_0=
+Gdip_Graphics_MeasureDriverString_1=
+Gdip_Graphics_MeasureDriverString_2=
+Gdip_Graphics_MeasureDriverString_3=
+Gdip_Graphics_MeasureDriverString_4=
+Gdip_Graphics_MeasureDriverString_5=
+Gdip_Graphics_MeasureDriverString_6=
+Gdip_Graphics_MeasureDriverString_7=
+
 Gdip_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2=flags=cpp
 Gdip_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2_0=cast=(Graphics *)
 Gdip_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2_1=cast=const WCHAR *
@@ -667,16 +677,6 @@ Gdip_Matrix_new_3=cast=(REAL)
 Gdip_Matrix_new_4=cast=(REAL)
 Gdip_Matrix_new_5=cast=(REAL)
 
-Gdip_Graphics_1MeasureDriverString=flags=no_gen
-Gdip_Graphics_1MeasureDriverString_0=
-Gdip_Graphics_1MeasureDriverString_1=
-Gdip_Graphics_1MeasureDriverString_2=
-Gdip_Graphics_1MeasureDriverString_3=
-Gdip_Graphics_1MeasureDriverString_4=
-Gdip_Graphics_1MeasureDriverString_5=
-Gdip_Graphics_1MeasureDriverString_6=
-Gdip_Graphics_1MeasureDriverString_7=
-
 Gdip_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I=
 Gdip_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_0=cast=PVOID
 Gdip_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_1=cast=CONST VOID*
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties
index 898e4d6780..145866bd0d 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.ole.win32.COM.properties
@@ -833,9 +833,6 @@ COM_put_accValue_CALLBACK=flags=no_gen
 COM_put_accValue_CALLBACK_0=
 
 
-org_eclipse_swt_internal_ole_win32_COMObject=flags=no_gen
-COMObject_ppVtable=
-
 org_eclipse_swt_internal_ole_win32_CONTROLINFO=
 CONTROLINFO_cb=
 CONTROLINFO_hAccel=cast=(HACCEL)
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.photon.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.photon.OS.properties
index 82b37ce80c..fd4d06ba78 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.photon.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.photon.OS.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -254,6 +254,9 @@ OS_PgSetMultiClip=
 OS_PgSetMultiClip_0=
 OS_PgSetMultiClip_1=cast=(PhRect_t const *)
 
+OS_PgSetMultiClipTiles=
+OS_PgSetMultiClipTiles_0=
+
 OS_PgSetPalette=
 OS_PgSetPalette_0=cast=(PgColor_t const *)
 OS_PgSetPalette_1=
@@ -289,6 +292,10 @@ OS_PgSetTextXORColor=
 OS_PgSetTextXORColor_0=cast=(PgColor_t)
 OS_PgSetTextXORColor_1=cast=(PgColor_t)
 
+OS_PgSetTranslation=
+OS_PgSetTranslation_0=
+OS_PgSetTranslation_1=
+
 OS_PgSetUserClip=
 OS_PgSetUserClip_0=cast=(PhRect_t const *)
 
@@ -734,6 +741,9 @@ OS_PtGetResources_0=cast=(PtWidget_t *)
 OS_PtGetResources_1=
 OS_PtGetResources_2=cast=(PtArg_t *)
 
+OS_PtGetVisibleTiles=
+OS_PtGetVisibleTiles_0=
+
 OS_PtGlobalFocusNext=
 OS_PtGlobalFocusNext_0=cast=(PtWidget_t *)
 OS_PtGlobalFocusNext_1=cast=(PhEvent_t *)
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.Win32.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.Win32.properties
index b17e15bf56..394d5c5bb6 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.Win32.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.win32.Win32.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties
index f9a29c3ad0..32ecc17dba 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF
new file mode 100755
index 0000000000..3330e6578e
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.eclipse.swt.tools; singleton:=true
+Bundle-Version: 3.5.0.qualifier
+Bundle-Activator: org.eclipse.swt.tools.Activator
+Bundle-ManifestVersion: 2
+Export-Package: org.eclipse.swt.tools,
+ org.eclipse.swt.tools.internal; x-internal:=true
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.swt;bundle-version="3.4.0",
+ org.eclipse.core.runtime;bundle-version="3.4.0",
+ org.eclipse.core.resources;bundle-version="3.4.0",
+ org.eclipse.jdt.core;bundle-version="3.4.0",
+ org.eclipse.ui;bundle-version="3.4.0",
+ org.eclipse.ui.editors;bundle-version="3.4.0"
diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/AppKitFull.bridgesupport b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/AppKitFull.bridgesupport
deleted file mode 100644
index 1c681dfef6..0000000000
--- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/AppKitFull.bridgesupport
+++ /dev/null
@@ -1,25393 +0,0 @@
-<?xml version='1.0'?>
-<signatures version='0.9'>
-  <depends_on path='/System/Library/Frameworks/ApplicationServices.framework'/>
-  <depends_on path='/System/Library/Frameworks/AudioToolbox.framework'/>
-  <depends_on path='/System/Library/Frameworks/AudioUnit.framework'/>
-  <depends_on path='/System/Library/Frameworks/CoreData.framework'/>
-  <depends_on path='/System/Library/Frameworks/Foundation.framework'/>
-  <depends_on path='/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework'/>
-  <depends_on path='/System/Library/Frameworks/IOKit.framework'/>
-  <depends_on path='/System/Library/Frameworks/QuartzCore.framework'/>
-  <depends_on path='/System/Library/Frameworks/Security.framework'/>
-  <depends_on path='/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework'/>
-  <depends_on path='/System/Library/Frameworks/CoreAudio.framework'/>
-  <depends_on path='/System/Library/Frameworks/DiskArbitration.framework'/>
-  <depends_on path='/System/Library/Frameworks/CoreServices.framework'/>
-  <depends_on path='/System/Library/Frameworks/CoreFoundation.framework'/>
-  <opaque name='NSModalSession' type='^{_NSModalSession=}'/>
-  <constant name='NSAbortModalException' declared_type='NSString*' type='@'/>
-  <constant name='NSAbortPrintingException' declared_type='NSString*' type='@'/>
-  <constant name='NSAccessibilityAllowedValuesAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityApplicationActivatedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityApplicationDeactivatedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityApplicationHiddenNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityApplicationRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityApplicationShownNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityAscendingSortDirectionValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityAttachmentTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityAttributedStringForRangeParameterizedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityBackgroundColorTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityBoundsForRangeParameterizedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityBrowserRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityBusyIndicatorRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityButtonRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityCancelAction' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityCancelButtonAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityCenterTabStopMarkerTypeValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityCentimetersUnitValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityCheckBoxRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityChildrenAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityClearButtonAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityCloseButtonAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityCloseButtonSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityColorWellRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityColumnCountAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityColumnRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityColumnTitlesAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityColumnsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityComboBoxRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityConfirmAction' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityContentsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityCreatedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDecimalTabStopMarkerTypeValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDecrementAction' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDecrementArrowSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDecrementButtonAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDecrementPageSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDefaultButtonAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDeleteAction' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDescendingSortDirectionValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDescriptionAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDialogSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDisclosedByRowAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDisclosedRowsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDisclosingAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDisclosureLevelAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDisclosureTriangleRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDocumentAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDrawerCreatedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityDrawerRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityEditedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityEnabledAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityErrorCodeExceptionInfo' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityException' declared_type='NSString*' type='@'/>
-  <constant name='NSAccessibilityExpandedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFilenameAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFirstLineIndentMarkerTypeValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFloatingWindowSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFocusedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFocusedUIElementAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFocusedUIElementChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFocusedWindowAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFocusedWindowChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFontFamilyKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFontNameKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFontSizeKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFontTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityForegroundColorTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityFrontmostAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityGridRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityGroupRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityGrowAreaAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityGrowAreaRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityHeadIndentMarkerTypeValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityHeaderAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityHelpAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityHelpTagCreatedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityHelpTagRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityHiddenAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityHorizontalOrientationValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityHorizontalScrollBarAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityImageRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityInchesUnitValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityIncrementAction' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityIncrementArrowSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityIncrementButtonAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityIncrementPageSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityIncrementorRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityIndexAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityInsertionPointLineNumberAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityLabelUIElementsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityLabelValueAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityLeftTabStopMarkerTypeValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityLineForIndexParameterizedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityLinkRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityLinkTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityLinkedUIElementsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityListRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMainAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMainWindowAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMainWindowChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMarkerGroupUIElementAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMarkerTypeAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMarkerTypeDescriptionAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMarkerUIElementsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMarkerValuesAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMatteContentUIElementAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMatteHoleAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMatteRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMaxValueAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMenuBarAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMenuBarRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMenuButtonRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMenuItemRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMenuRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMinValueAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMinimizeButtonAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMinimizeButtonSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMinimizedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMisspelledTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityModalAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityMovedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityNextContentsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityNumberOfCharactersAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityOrderedByRowAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityOrientationAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityOutlineRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityOutlineRowSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityOverflowButtonAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityParentAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityPicasUnitValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityPickAction' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityPointsUnitValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityPopUpButtonRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityPositionAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityPressAction' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityPreviousContentsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityProgressIndicatorRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityProxyAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRTFForRangeParameterizedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRadioButtonRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRadioGroupRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRaiseAction' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRangeForIndexParameterizedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRangeForLineParameterizedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRangeForPositionParameterizedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityResizedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRightTabStopMarkerTypeValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRoleAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRoleDescriptionAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRowCountAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRowCountChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRowRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRowsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRulerMarkerRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityRulerRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityScrollAreaRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityScrollBarRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySearchButtonAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySearchFieldSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySearchMenuAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySecureTextFieldSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySelectedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySelectedChildrenAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySelectedChildrenChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySelectedColumnsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySelectedColumnsChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySelectedRowsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySelectedRowsChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySelectedTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySelectedTextChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySelectedTextRangeAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySelectedTextRangesAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityServesAsTitleForUIElementsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityShadowTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySharedCharacterRangeAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySharedTextUIElementsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySheetCreatedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySheetRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityShowMenuAction' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityShownMenuAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySizeAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySliderRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySortButtonRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySortDirectionAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySplitGroupRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySplitterRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySplittersAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityStandardWindowSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityStaticTextRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityStrikethroughColorTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityStrikethroughTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityStringForRangeParameterizedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityStyleRangeForIndexParameterizedAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySubroleAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySuperscriptTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySystemDialogSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySystemFloatingWindowSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilitySystemWideRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTabGroupRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTableRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTableRowSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTabsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTailIndentMarkerTypeValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTextAreaRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTextAttachmentSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTextFieldRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTextLinkSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTimelineSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTitleAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTitleChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTitleUIElementAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityToolbarButtonAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityToolbarButtonSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityToolbarRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityTopLevelUIElementAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityUIElementDestroyedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityURLAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityUnderlineColorTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityUnderlineTextAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityUnitDescriptionAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityUnitsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityUnknownMarkerTypeValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityUnknownRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityUnknownSortDirectionValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityUnknownSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityUnknownUnitValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityValueAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityValueChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityValueDescriptionAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityValueIndicatorRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityVerticalOrientationValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityVerticalScrollBarAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityVisibleCharacterRangeAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityVisibleChildrenAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityVisibleColumnsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityVisibleNameKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityVisibleRowsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityWindowAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityWindowCreatedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityWindowDeminiaturizedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityWindowMiniaturizedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityWindowMovedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityWindowResizedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityWindowRole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityWindowsAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityZoomButtonAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAccessibilityZoomButtonSubrole' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAlignmentBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSAllRomanInputSourcesLocaleIdentifier' declared_type='NSString*' type='@'/>
-  <constant name='NSAllowsEditingMultipleValuesSelectionBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSAllowsNullArgumentBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSAlternateImageBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSAlternateTitleBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSAlwaysPresentsApplicationModalAlertsBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSAnimateBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSAnimationDelayBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSAnimationProgressMark' declared_type='NSString*' type='@'/>
-  <constant name='NSAnimationProgressMarkNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSAnimationTriggerOrderIn' declared_type='NSString*' type='@'/>
-  <constant name='NSAnimationTriggerOrderOut' declared_type='NSString*' type='@'/>
-  <constant name='NSAntialiasThresholdChangedNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApp' declared_type='id' type='@'/>
-  <constant name='NSAppKitIgnoredException' declared_type='NSString*' type='@'/>
-  <constant name='NSAppKitVersionNumber' declared_type='double' type='d' const='true'/>
-  <constant name='NSAppKitVirtualMemoryException' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationDidBecomeActiveNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationDidChangeScreenParametersNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationDidFinishLaunchingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationDidHideNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationDidResignActiveNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationDidUnhideNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationDidUpdateNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationFileType' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationWillBecomeActiveNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationWillFinishLaunchingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationWillHideNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationWillResignActiveNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationWillTerminateNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationWillUnhideNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSApplicationWillUpdateNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSArgumentBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSAttachmentAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSAttributedStringBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSAuthorDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSBackgroundColorAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSBackgroundColorDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSBadBitmapParametersException' declared_type='NSString*' type='@'/>
-  <constant name='NSBadComparisonException' declared_type='NSString*' type='@'/>
-  <constant name='NSBadRTFColorTableException' declared_type='NSString*' type='@'/>
-  <constant name='NSBadRTFDirectiveException' declared_type='NSString*' type='@'/>
-  <constant name='NSBadRTFFontTableException' declared_type='NSString*' type='@'/>
-  <constant name='NSBadRTFStyleSheetException' declared_type='NSString*' type='@'/>
-  <constant name='NSBaseURLDocumentOption' declared_type='NSString*' type='@'/>
-  <constant name='NSBaselineOffsetAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSBlack' declared_type='CGFloat' type='f' type64='d' const='true'/>
-  <constant name='NSBottomMarginDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSBrowserColumnConfigurationDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSBrowserIllegalDelegateException' declared_type='NSString*' type='@'/>
-  <constant name='NSCalibratedBlackColorSpace' declared_type='NSString*' type='@'/>
-  <constant name='NSCalibratedRGBColorSpace' declared_type='NSString*' type='@'/>
-  <constant name='NSCalibratedWhiteColorSpace' declared_type='NSString*' type='@'/>
-  <constant name='NSCharacterEncodingDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSCharacterEncodingDocumentOption' declared_type='NSString*' type='@'/>
-  <constant name='NSCharacterShapeAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSCocoaVersionDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSColorListDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSColorListIOException' declared_type='NSString*' type='@'/>
-  <constant name='NSColorListNotEditableException' declared_type='NSString*' type='@'/>
-  <constant name='NSColorPanelColorDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSColorPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSComboBoxSelectionDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSComboBoxSelectionIsChangingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSComboBoxWillDismissNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSComboBoxWillPopUpNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSCommentDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSCompanyDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSConditionallySetsEditableBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSConditionallySetsEnabledBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSConditionallySetsHiddenBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSContentArrayBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSContentArrayForMultipleSelectionBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSContentBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSContentDictionaryBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSContentHeightBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSContentObjectBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSContentObjectsBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSContentPlacementTagBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSContentSetBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSContentValuesBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSContentWidthBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSContextHelpModeDidActivateNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSContextHelpModeDidDeactivateNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSContinuouslyUpdatesValueBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSControlTextDidBeginEditingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSControlTextDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSControlTextDidEndEditingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSControlTintDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSConvertedDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSCopyrightDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSCreatesSortDescriptorBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSCreationTimeDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSCriticalValueBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSCursorAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSCustomColorSpace' declared_type='NSString*' type='@'/>
-  <constant name='NSDarkGray' declared_type='CGFloat' type='f' type64='d' const='true'/>
-  <constant name='NSDataBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSDefaultAttributesDocumentOption' declared_type='NSString*' type='@'/>
-  <constant name='NSDefaultTabIntervalDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSDeletesObjectsOnRemoveBindingsOption' declared_type='NSString*' type='@'/>
-  <constant name='NSDeviceBitsPerSample' declared_type='NSString*' type='@'/>
-  <constant name='NSDeviceBlackColorSpace' declared_type='NSString*' type='@'/>
-  <constant name='NSDeviceCMYKColorSpace' declared_type='NSString*' type='@'/>
-  <constant name='NSDeviceColorSpaceName' declared_type='NSString*' type='@'/>
-  <constant name='NSDeviceIsPrinter' declared_type='NSString*' type='@'/>
-  <constant name='NSDeviceIsScreen' declared_type='NSString*' type='@'/>
-  <constant name='NSDeviceRGBColorSpace' declared_type='NSString*' type='@'/>
-  <constant name='NSDeviceResolution' declared_type='NSString*' type='@'/>
-  <constant name='NSDeviceSize' declared_type='NSString*' type='@'/>
-  <constant name='NSDeviceWhiteColorSpace' declared_type='NSString*' type='@'/>
-  <constant name='NSDirectoryFileType' declared_type='NSString*' type='@'/>
-  <constant name='NSDisplayNameBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSDisplayPatternBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSDisplayPatternTitleBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSDisplayPatternValueBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSDocFormatTextDocumentType' declared_type='NSString*' type='@'/>
-  <constant name='NSDocumentEditedBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSDocumentTypeDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSDocumentTypeDocumentOption' declared_type='NSString*' type='@'/>
-  <constant name='NSDoubleClickArgumentBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSDoubleClickTargetBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSDragPboard' declared_type='NSString*' type='@'/>
-  <constant name='NSDraggingException' declared_type='NSString*' type='@'/>
-  <constant name='NSDrawerDidCloseNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSDrawerDidOpenNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSDrawerWillCloseNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSDrawerWillOpenNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSEditableBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSEditorDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSEnabledBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSEventTrackingRunLoopMode' declared_type='NSString*' type='@'/>
-  <constant name='NSExcludedElementsDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSExcludedKeysBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSExpansionAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSFileContentsPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSFilenamesPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSFilesPromisePboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSFilesystemFileType' declared_type='NSString*' type='@'/>
-  <constant name='NSFilterPredicateBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSFindPanelCaseInsensitiveSearch' declared_type='NSString*' type='@'/>
-  <constant name='NSFindPanelSearchOptionsPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSFindPanelSubstringMatch' declared_type='NSString*' type='@'/>
-  <constant name='NSFindPboard' declared_type='NSString*' type='@'/>
-  <constant name='NSFontAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSFontBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSFontBoldBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSFontCascadeListAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSFontCharacterSetAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSFontFaceAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSFontFamilyAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSFontFamilyNameBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSFontFeatureSelectorIdentifierKey' declared_type='NSString*' type='@'/>
-  <constant name='NSFontFeatureSettingsAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSFontFeatureTypeIdentifierKey' declared_type='NSString*' type='@'/>
-  <constant name='NSFontFixedAdvanceAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSFontIdentityMatrix' declared_type='CGFloat*' type='^f' type64='^d' const='true'/>
-  <constant name='NSFontItalicBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSFontMatrixAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSFontNameAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSFontNameBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSFontPboard' declared_type='NSString*' type='@'/>
-  <constant name='NSFontPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSFontSetChangedNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSFontSizeAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSFontSizeBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSFontSlantTrait' declared_type='NSString*' type='@'/>
-  <constant name='NSFontSymbolicTrait' declared_type='NSString*' type='@'/>
-  <constant name='NSFontTraitsAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSFontUnavailableException' declared_type='NSString*' type='@'/>
-  <constant name='NSFontVariationAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSFontVariationAxisDefaultValueKey' declared_type='NSString*' type='@'/>
-  <constant name='NSFontVariationAxisIdentifierKey' declared_type='NSString*' type='@'/>
-  <constant name='NSFontVariationAxisMaximumValueKey' declared_type='NSString*' type='@'/>
-  <constant name='NSFontVariationAxisMinimumValueKey' declared_type='NSString*' type='@'/>
-  <constant name='NSFontVariationAxisNameKey' declared_type='NSString*' type='@'/>
-  <constant name='NSFontVisibleNameAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSFontWeightTrait' declared_type='NSString*' type='@'/>
-  <constant name='NSFontWidthTrait' declared_type='NSString*' type='@'/>
-  <constant name='NSForegroundColorAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSFullScreenModeAllScreens' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFullScreenModeSetting' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFullScreenModeWindowLevel' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSGeneralPboard' declared_type='NSString*' type='@'/>
-  <constant name='NSGlyphInfoAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSGraphicsContextDestinationAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSGraphicsContextPDFFormat' declared_type='NSString*' type='@'/>
-  <constant name='NSGraphicsContextPSFormat' declared_type='NSString*' type='@'/>
-  <constant name='NSGraphicsContextRepresentationFormatAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSHTMLPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSHTMLTextDocumentType' declared_type='NSString*' type='@'/>
-  <constant name='NSHandlesContentAsCompoundValueBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSHeaderTitleBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSHiddenBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSHyphenationFactorDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSIllegalSelectorException' declared_type='NSString*' type='@'/>
-  <constant name='NSImageBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSImageCacheException' declared_type='NSString*' type='@'/>
-  <constant name='NSImageColorSyncProfileData' declared_type='NSString*' type='@'/>
-  <constant name='NSImageCompressionFactor' declared_type='NSString*' type='@'/>
-  <constant name='NSImageCompressionMethod' declared_type='NSString*' type='@'/>
-  <constant name='NSImageCurrentFrame' declared_type='NSString*' type='@'/>
-  <constant name='NSImageCurrentFrameDuration' declared_type='NSString*' type='@'/>
-  <constant name='NSImageDitherTransparency' declared_type='NSString*' type='@'/>
-  <constant name='NSImageEXIFData' declared_type='NSString*' type='@'/>
-  <constant name='NSImageFallbackBackgroundColor' declared_type='NSString*' type='@'/>
-  <constant name='NSImageFrameCount' declared_type='NSString*' type='@'/>
-  <constant name='NSImageGamma' declared_type='NSString*' type='@'/>
-  <constant name='NSImageInterlaced' declared_type='NSString*' type='@'/>
-  <constant name='NSImageLoopCount' declared_type='NSString*' type='@'/>
-  <constant name='NSImageNameActionTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameAddTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameAdvanced' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameBluetoothTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameBonjour' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameColorPanel' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameColumnViewTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameComputer' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameDotMac' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameEnterFullScreenTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameEveryone' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameExitFullScreenTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameFlowViewTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameFolderBurnable' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameFolderSmart' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameFollowLinkFreestandingTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameFontPanel' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameGoLeftTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameGoRightTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameIChatTheaterTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameIconViewTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameInfo' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameInvalidDataFreestandingTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameLeftFacingTriangleTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameListViewTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameLockLockedTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameLockUnlockedTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameMultipleDocuments' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameNetwork' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNamePathTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNamePreferencesGeneral' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameQuickLookTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameRefreshFreestandingTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameRefreshTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameRemoveTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameRevealFreestandingTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameRightFacingTriangleTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameSlideshowTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameSmartBadgeTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameStopProgressFreestandingTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameStopProgressTemplate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameUser' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameUserAccounts' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageNameUserGroup' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSImageProgressive' declared_type='NSString*' type='@'/>
-  <constant name='NSImageRGBColorTable' declared_type='NSString*' type='@'/>
-  <constant name='NSImageRepRegistryDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSIncludedKeysBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSInitialKeyBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSInitialValueBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSInkTextPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSInsertsNullPlaceholderBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSInterfaceStyleDefault' declared_type='NSString*' type='@'/>
-  <constant name='NSInvokesSeparatelyWithArrayObjectsBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSIsIndeterminateBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSKernAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSKeywordsDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSLabelBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSLeftMarginDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSLigatureAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSLightGray' declared_type='CGFloat' type='f' type64='d' const='true'/>
-  <constant name='NSLinkAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSLocalizedKeyDictionaryBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSMacSimpleTextDocumentType' declared_type='NSString*' type='@'/>
-  <constant name='NSManagedObjectContextBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSMarkedClauseSegmentAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSMaxValueBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSMaxWidthBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSMaximumRecentsBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSMenuDidAddItemNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSMenuDidBeginTrackingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSMenuDidChangeItemNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSMenuDidEndTrackingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSMenuDidRemoveItemNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSMenuDidSendActionNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSMenuWillSendActionNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSMinValueBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSMinWidthBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSMixedStateImageBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSModalPanelRunLoopMode' declared_type='NSString*' type='@'/>
-  <constant name='NSModificationTimeDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSMultipleTextSelectionPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSMultipleValuesMarker' declared_type='id' type='@'/>
-  <constant name='NSMultipleValuesPlaceholderBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSNamedColorSpace' declared_type='NSString*' type='@'/>
-  <constant name='NSNibLoadingException' declared_type='NSString*' type='@'/>
-  <constant name='NSNibOwner' declared_type='NSString*' type='@'/>
-  <constant name='NSNibTopLevelObjects' declared_type='NSString*' type='@'/>
-  <constant name='NSNoSelectionMarker' declared_type='id' type='@'/>
-  <constant name='NSNoSelectionPlaceholderBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSNotApplicableMarker' declared_type='id' type='@'/>
-  <constant name='NSNotApplicablePlaceholderBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSNullPlaceholderBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSObliquenessAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSObservedKeyPathKey' declared_type='NSString*' type='@'/>
-  <constant name='NSObservedObjectKey' declared_type='NSString*' type='@'/>
-  <constant name='NSOffStateImageBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSOfficeOpenXMLTextDocumentType' declared_type='NSString*' type='@'/>
-  <constant name='NSOnStateImageBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSOpenDocumentTextDocumentType' declared_type='NSString*' type='@'/>
-  <constant name='NSOptionsKey' declared_type='NSString*' type='@'/>
-  <constant name='NSOutlineViewColumnDidMoveNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSOutlineViewColumnDidResizeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSOutlineViewItemDidCollapseNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSOutlineViewItemDidExpandNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSOutlineViewItemWillCollapseNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSOutlineViewItemWillExpandNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSOutlineViewSelectionDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSOutlineViewSelectionIsChangingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSPDFPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSPICTPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSPPDIncludeNotFoundException' declared_type='NSString*' type='@'/>
-  <constant name='NSPPDIncludeStackOverflowException' declared_type='NSString*' type='@'/>
-  <constant name='NSPPDIncludeStackUnderflowException' declared_type='NSString*' type='@'/>
-  <constant name='NSPPDParseException' declared_type='NSString*' type='@'/>
-  <constant name='NSPaperSizeDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSParagraphStyleAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSPasteboardCommunicationException' declared_type='NSString*' type='@'/>
-  <constant name='NSPatternColorSpace' declared_type='NSString*' type='@'/>
-  <constant name='NSPlainFileType' declared_type='NSString*' type='@'/>
-  <constant name='NSPlainTextDocumentType' declared_type='NSString*' type='@'/>
-  <constant name='NSPopUpButtonCellWillPopUpNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSPopUpButtonWillPopUpNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSPostScriptPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSPredicateBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSPredicateFormatBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSPrefixSpacesDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintAllPages' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintBottomMargin' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintCancelJob' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintCopies' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintDetailedErrorReporting' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFaxCoverSheetName' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFaxHighResolution' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFaxJob' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFaxModem' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFaxNumber' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFaxReceiverNames' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFaxReceiverNumbers' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFaxReturnReceipt' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFaxSendTime' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFaxTrimPageEnds' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFaxUseCoverSheet' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFirstPage' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintFormName' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintHeaderAndFooter' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintHorizontalPagination' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintHorizontallyCentered' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintJobDisposition' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintJobFeatures' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintLastPage' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintLeftMargin' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintManualFeed' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintMustCollate' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintOperationExistsException' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintOrientation' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPackageException' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPagesAcross' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPagesDown' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPagesPerSheet' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPanelAccessorySummaryItemDescriptionKey' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPanelAccessorySummaryItemNameKey' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPaperFeed' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPaperName' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPaperSize' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPhotoJobStyleHint' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPreviewJob' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPrinter' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintPrinterName' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintReversePageOrder' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintRightMargin' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintSaveJob' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintSavePath' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintScalingFactor' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintSpoolJob' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintTime' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintTopMargin' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintVerticalPagination' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintVerticallyCentered' declared_type='NSString*' type='@'/>
-  <constant name='NSPrintingCommunicationException' declared_type='NSString*' type='@'/>
-  <constant name='NSRTFDPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSRTFDTextDocumentType' declared_type='NSString*' type='@'/>
-  <constant name='NSRTFPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSRTFPropertyStackOverflowException' declared_type='NSString*' type='@'/>
-  <constant name='NSRTFTextDocumentType' declared_type='NSString*' type='@'/>
-  <constant name='NSRaisesForNotApplicableKeysBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSReadOnlyDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSRecentSearchesBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSRepresentedFilenameBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSRightMarginDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSRowHeightBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSRuleEditorPredicateComparisonModifier' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSRuleEditorPredicateCompoundType' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSRuleEditorPredicateCustomSelector' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSRuleEditorPredicateLeftExpression' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSRuleEditorPredicateOperatorType' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSRuleEditorPredicateOptions' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSRuleEditorPredicateRightExpression' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSRuleEditorRowsDidChangeNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSRulerPboard' declared_type='NSString*' type='@'/>
-  <constant name='NSRulerPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSSelectedIdentifierBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSSelectedIndexBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSSelectedLabelBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSSelectedObjectBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSSelectedObjectsBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSSelectedTagBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSSelectedValueBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSSelectedValuesBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSSelectionIndexPathsBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSSelectionIndexesBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSSelectorNameBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSSelectsAllWhenSettingContentBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSShadowAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSShellCommandFileType' declared_type='NSString*' type='@'/>
-  <constant name='NSSortDescriptorsBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSSoundPboardType' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechCharacterModeProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechCommandDelimiterProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechCommandPrefix' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechCommandSuffix' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechCurrentVoiceProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechDictionaryAbbreviations' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechDictionaryEntryPhonemes' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechDictionaryEntrySpelling' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechDictionaryLocaleIdentifier' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechDictionaryModificationDate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechDictionaryPronunciations' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechErrorCount' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechErrorNewestCharacterOffset' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechErrorNewestCode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechErrorOldestCharacterOffset' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechErrorOldestCode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechErrorsProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechInputModeProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechModeLiteral' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechModeNormal' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechModePhoneme' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechModeText' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechNumberModeProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechOutputToFileURLProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechPhonemeInfoExample' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechPhonemeInfoHiliteEnd' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechPhonemeInfoHiliteStart' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechPhonemeInfoOpcode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechPhonemeInfoSymbol' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechPhonemeSymbolsProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechPitchBaseProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechPitchModProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechRateProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechRecentSyncProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechResetProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechStatusNumberOfCharactersLeft' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechStatusOutputBusy' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechStatusOutputPaused' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechStatusPhonemeCode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechStatusProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechSynthesizerInfoIdentifier' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechSynthesizerInfoProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechSynthesizerInfoVersion' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpeechVolumeProperty' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSpellingStateAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSSplitViewDidResizeSubviewsNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSSplitViewWillResizeSubviewsNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSStrikethroughColorAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSStrikethroughStyleAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSStringPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSStrokeColorAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSStrokeWidthAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSSubjectDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSSuperscriptAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSSystemColorsDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTIFFException' declared_type='NSString*' type='@'/>
-  <constant name='NSTIFFPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSTabColumnTerminatorsAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSTableViewColumnDidMoveNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTableViewColumnDidResizeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTableViewSelectionDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTableViewSelectionIsChangingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTabularTextPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSTargetBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSTextColorBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSTextDidBeginEditingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTextDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTextDidEndEditingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTextEncodingNameDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSTextEncodingNameDocumentOption' declared_type='NSString*' type='@'/>
-  <constant name='NSTextLineTooLongException' declared_type='NSString*' type='@'/>
-  <constant name='NSTextNoSelectionException' declared_type='NSString*' type='@'/>
-  <constant name='NSTextReadException' declared_type='NSString*' type='@'/>
-  <constant name='NSTextSizeMultiplierDocumentOption' declared_type='NSString*' type='@'/>
-  <constant name='NSTextStorageDidProcessEditingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTextStorageWillProcessEditingNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTextViewDidChangeSelectionNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTextViewDidChangeTypingAttributesNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTextViewWillChangeNotifyingTextViewNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTextWriteException' declared_type='NSString*' type='@'/>
-  <constant name='NSTimeoutDocumentOption' declared_type='NSString*' type='@'/>
-  <constant name='NSTitleBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSTitleDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSToolTipAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSToolTipBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSToolbarCustomizeToolbarItemIdentifier' declared_type='NSString*' type='@'/>
-  <constant name='NSToolbarDidRemoveItemNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSToolbarFlexibleSpaceItemIdentifier' declared_type='NSString*' type='@'/>
-  <constant name='NSToolbarPrintItemIdentifier' declared_type='NSString*' type='@'/>
-  <constant name='NSToolbarSeparatorItemIdentifier' declared_type='NSString*' type='@'/>
-  <constant name='NSToolbarShowColorsItemIdentifier' declared_type='NSString*' type='@'/>
-  <constant name='NSToolbarShowFontsItemIdentifier' declared_type='NSString*' type='@'/>
-  <constant name='NSToolbarSpaceItemIdentifier' declared_type='NSString*' type='@'/>
-  <constant name='NSToolbarWillAddItemNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSTopMarginDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSTransparentBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSTypedStreamVersionException' declared_type='NSString*' type='@'/>
-  <constant name='NSURLPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSUnderlineByWordMask' declared_type='NSUInteger' type='I' type64='Q'/>
-  <constant name='NSUnderlineColorAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSUnderlineStrikethroughMask' declared_type='NSUInteger' type='I' type64='Q'/>
-  <constant name='NSUnderlineStyleAttributeName' declared_type='NSString*' type='@'/>
-  <constant name='NSVCardPboardType' declared_type='NSString*' type='@'/>
-  <constant name='NSValidatesImmediatelyBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSValueBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSValuePathBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSValueTransformerBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSValueTransformerNameBindingOption' declared_type='NSString*' type='@'/>
-  <constant name='NSValueURLBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSViewAnimationEffectKey' declared_type='NSString*' type='@'/>
-  <constant name='NSViewAnimationEndFrameKey' declared_type='NSString*' type='@'/>
-  <constant name='NSViewAnimationFadeInEffect' declared_type='NSString*' type='@'/>
-  <constant name='NSViewAnimationFadeOutEffect' declared_type='NSString*' type='@'/>
-  <constant name='NSViewAnimationStartFrameKey' declared_type='NSString*' type='@'/>
-  <constant name='NSViewAnimationTargetKey' declared_type='NSString*' type='@'/>
-  <constant name='NSViewBoundsDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSViewDidUpdateTrackingAreasNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSViewFocusDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSViewFrameDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSViewGlobalFrameDidChangeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSViewModeDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSViewSizeDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSViewZoomDocumentAttribute' declared_type='NSString*' type='@'/>
-  <constant name='NSVisibleBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSVoiceAge' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSVoiceDemoText' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSVoiceGender' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSVoiceGenderFemale' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSVoiceGenderMale' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSVoiceGenderNeuter' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSVoiceIdentifier' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSVoiceIndividuallySpokenCharacters' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSVoiceLocaleIdentifier' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSVoiceName' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSVoiceSupportedCharacters' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSWarningValueBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSWebArchiveTextDocumentType' declared_type='NSString*' type='@'/>
-  <constant name='NSWebPreferencesDocumentOption' declared_type='NSString*' type='@'/>
-  <constant name='NSWebResourceLoadDelegateDocumentOption' declared_type='NSString*' type='@'/>
-  <constant name='NSWhite' declared_type='CGFloat' type='f' type64='d' const='true'/>
-  <constant name='NSWidthBinding' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidBecomeKeyNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidBecomeMainNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidChangeScreenNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidChangeScreenProfileNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidDeminiaturizeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidEndSheetNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidExposeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidMiniaturizeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidMoveNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidResignKeyNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidResignMainNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidResizeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowDidUpdateNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowServerCommunicationException' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowWillBeginSheetNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowWillCloseNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowWillMiniaturizeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWindowWillMoveNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWordMLTextDocumentType' declared_type='NSString*' type='@'/>
-  <constant name='NSWordTablesReadException' declared_type='NSString*' type='@'/>
-  <constant name='NSWordTablesWriteException' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceCompressOperation' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceCopyOperation' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceDecompressOperation' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceDecryptOperation' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceDestroyOperation' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceDidLaunchApplicationNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceDidMountNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceDidPerformFileOperationNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceDidTerminateApplicationNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceDidUnmountNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceDidWakeNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceDuplicateOperation' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceEncryptOperation' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceLinkOperation' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceMoveOperation' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceRecycleOperation' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceSessionDidBecomeActiveNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceSessionDidResignActiveNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceWillLaunchApplicationNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceWillPowerOffNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceWillSleepNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSWorkspaceWillUnmountNotification' declared_type='NSString*' type='@'/>
-  <enum name='NSAWTEventType' value='16'/>
-  <enum name='NSAboveBottom' value='4'/>
-  <enum name='NSAboveTop' value='1'/>
-  <enum name='NSAddTraitFontAction' value='2'/>
-  <enum name='NSAdobeCNS1CharacterCollection' value='1'/>
-  <enum name='NSAdobeGB1CharacterCollection' value='2'/>
-  <enum name='NSAdobeJapan1CharacterCollection' value='3'/>
-  <enum name='NSAdobeJapan2CharacterCollection' value='4'/>
-  <enum name='NSAdobeKorea1CharacterCollection' value='5'/>
-  <enum name='NSAlertAlternateReturn' value='0'/>
-  <enum name='NSAlertDefaultReturn' value='1'/>
-  <enum name='NSAlertErrorReturn' value='-2'/>
-  <enum name='NSAlertFirstButtonReturn' value='1000'/>
-  <enum name='NSAlertOtherReturn' value='-1'/>
-  <enum name='NSAlertSecondButtonReturn' value='1001'/>
-  <enum name='NSAlertThirdButtonReturn' value='1002'/>
-  <enum name='NSAllScrollerParts' value='2'/>
-  <enum name='NSAlphaFirstBitmapFormat' value='1'/>
-  <enum name='NSAlphaNonpremultipliedBitmapFormat' value='2'/>
-  <enum name='NSAlphaShiftKeyMask' value='65536'/>
-  <enum name='NSAlternateKeyMask' value='524288'/>
-  <enum name='NSAnimationBlocking' value='0'/>
-  <enum name='NSAnimationEaseIn' value='1'/>
-  <enum name='NSAnimationEaseInOut' value='0'/>
-  <enum name='NSAnimationEaseOut' value='2'/>
-  <enum name='NSAnimationEffectDisappearingItemDefault' value='0'/>
-  <enum name='NSAnimationEffectPoof' value='10'/>
-  <enum name='NSAnimationLinear' value='3'/>
-  <enum name='NSAnimationNonblocking' value='1'/>
-  <enum name='NSAnimationNonblockingThreaded' value='2'/>
-  <enum name='NSAnyEventMask' value='-1'/>
-  <enum name='NSAnyType' value='0'/>
-  <enum name='NSAppKitDefined' value='13'/>
-  <enum name='NSAppKitDefinedMask' value='8192'/>
-  <enum name='NSAppKitVersionNumber10_0' value='577'/>
-  <enum name='NSAppKitVersionNumber10_1' value='620'/>
-  <enum name='NSAppKitVersionNumber10_2' value='663'/>
-  <enum name='NSAppKitVersionNumber10_2_3' value='663.60000000000002'/>
-  <enum name='NSAppKitVersionNumber10_3' value='743'/>
-  <enum name='NSAppKitVersionNumber10_3_2' value='743.13999999999999'/>
-  <enum name='NSAppKitVersionNumber10_3_3' value='743.20000000000005'/>
-  <enum name='NSAppKitVersionNumber10_3_5' value='743.24000000000001'/>
-  <enum name='NSAppKitVersionNumber10_3_7' value='743.33000000000004'/>
-  <enum name='NSAppKitVersionNumber10_3_9' value='743.36000000000001'/>
-  <enum name='NSAppKitVersionNumber10_4' value='824'/>
-  <enum name='NSAppKitVersionNumberWithColumnResizingBrowser' value='685.00000000000000'/>
-  <enum name='NSAppKitVersionNumberWithContinuousScrollingBrowser' value='680.00000000000000'/>
-  <enum name='NSAppKitVersionNumberWithCursorSizeSupport' value='682.00000000000000'/>
-  <enum name='NSAppKitVersionNumberWithCustomSheetPosition' value='686.00000000000000'/>
-  <enum name='NSAppKitVersionNumberWithDirectionalTabs' value='631.00000000000000'/>
-  <enum name='NSAppKitVersionNumberWithPatternColorLeakFix' value='641.00000000000000'/>
-  <enum name='NSApplicationActivatedEventType' value='1'/>
-  <enum name='NSApplicationDeactivatedEventType' value='2'/>
-  <enum name='NSApplicationDefined' value='15'/>
-  <enum name='NSApplicationDefinedMask' value='32768'/>
-  <enum name='NSApplicationDelegateReplyCancel' value='1'/>
-  <enum name='NSApplicationDelegateReplyFailure' value='2'/>
-  <enum name='NSApplicationDelegateReplySuccess' value='0'/>
-  <enum name='NSAscendingPageOrder' value='1'/>
-  <enum name='NSAtBottom' value='5'/>
-  <enum name='NSAtTop' value='2'/>
-  <enum name='NSAttachmentCharacter' value='65532'/>
-  <enum name='NSAutoPagination' value='0'/>
-  <enum name='NSAutosaveOperation' value='3'/>
-  <enum name='NSBMPFileType' value='1'/>
-  <enum name='NSBackTabCharacter' value='25'/>
-  <enum name='NSBackgroundStyleDark' value='1'/>
-  <enum name='NSBackgroundStyleLight' value='0'/>
-  <enum name='NSBackgroundStyleLowered' value='3'/>
-  <enum name='NSBackgroundStyleRaised' value='2'/>
-  <enum name='NSBackgroundTab' value='1'/>
-  <enum name='NSBackingStoreBuffered' value='2'/>
-  <enum name='NSBackingStoreNonretained' value='1'/>
-  <enum name='NSBackingStoreRetained' value='0'/>
-  <enum name='NSBackspaceCharacter' value='8'/>
-  <enum name='NSBacktabTextMovement' value='18'/>
-  <enum name='NSBeginFunctionKey' value='63274'/>
-  <enum name='NSBelowBottom' value='6'/>
-  <enum name='NSBelowTop' value='3'/>
-  <enum name='NSBevelLineJoinStyle' value='2'/>
-  <enum name='NSBezelBorder' value='2'/>
-  <enum name='NSBlueControlTint' value='1'/>
-  <enum name='NSBoldFontMask' value='2'/>
-  <enum name='NSBorderlessWindowMask' value='0'/>
-  <enum name='NSBottomTabsBezelBorder' value='2'/>
-  <enum name='NSBoxCustom' value='4'/>
-  <enum name='NSBoxOldStyle' value='3'/>
-  <enum name='NSBoxPrimary' value='0'/>
-  <enum name='NSBoxSecondary' value='1'/>
-  <enum name='NSBoxSeparator' value='2'/>
-  <enum name='NSBreakFunctionKey' value='63282'/>
-  <enum name='NSBrowserAutoColumnResizing' value='1'/>
-  <enum name='NSBrowserDropAbove' value='1'/>
-  <enum name='NSBrowserDropOn' value='0'/>
-  <enum name='NSBrowserNoColumnResizing' value='0'/>
-  <enum name='NSBrowserUserColumnResizing' value='2'/>
-  <enum name='NSButtLineCapStyle' value='0'/>
-  <enum name='NSCMYKColorSpaceModel' value='2'/>
-  <enum name='NSCMYKModeColorPanel' value='2'/>
-  <enum name='NSCancelButton' value='0'/>
-  <enum name='NSCancelTextMovement' value='23'/>
-  <enum name='NSCarriageReturnCharacter' value='13'/>
-  <enum name='NSCellAllowsMixedState' value='16'/>
-  <enum name='NSCellChangesContents' value='14'/>
-  <enum name='NSCellDisabled' value='0'/>
-  <enum name='NSCellEditable' value='3'/>
-  <enum name='NSCellHasImageHorizontal' value='12'/>
-  <enum name='NSCellHasImageOnLeftOrBottom' value='13'/>
-  <enum name='NSCellHasOverlappingImage' value='11'/>
-  <enum name='NSCellHighlighted' value='5'/>
-  <enum name='NSCellHitContentArea' value='1'/>
-  <enum name='NSCellHitEditableTextArea' value='2'/>
-  <enum name='NSCellHitNone' value='0'/>
-  <enum name='NSCellHitTrackableArea' value='4'/>
-  <enum name='NSCellIsBordered' value='10'/>
-  <enum name='NSCellIsInsetButton' value='15'/>
-  <enum name='NSCellLightsByBackground' value='9'/>
-  <enum name='NSCellLightsByContents' value='6'/>
-  <enum name='NSCellLightsByGray' value='7'/>
-  <enum name='NSCellState' value='1'/>
-  <enum name='NSCenterTabStopType' value='2'/>
-  <enum name='NSCenterTextAlignment' value='2'/>
-  <enum name='NSChangeAutosaved' value='4'/>
-  <enum name='NSChangeBackgroundCell' value='8'/>
-  <enum name='NSChangeBackgroundCellMask' value='8'/>
-  <enum name='NSChangeCleared' value='2'/>
-  <enum name='NSChangeDone' value='0'/>
-  <enum name='NSChangeGrayCell' value='4'/>
-  <enum name='NSChangeGrayCellMask' value='4'/>
-  <enum name='NSChangeReadOtherContents' value='3'/>
-  <enum name='NSChangeRedone' value='5'/>
-  <enum name='NSChangeUndone' value='1'/>
-  <enum name='NSCircularBezelStyle' value='7'/>
-  <enum name='NSCircularSlider' value='1'/>
-  <enum name='NSClearControlTint' value='7'/>
-  <enum name='NSClearDisplayFunctionKey' value='63290'/>
-  <enum name='NSClearLineFunctionKey' value='63289'/>
-  <enum name='NSClipPagination' value='2'/>
-  <enum name='NSClockAndCalendarDatePickerStyle' value='1'/>
-  <enum name='NSClosableWindowMask' value='2'/>
-  <enum name='NSClosePathBezierPathElement' value='3'/>
-  <enum name='NSColorListModeColorPanel' value='5'/>
-  <enum name='NSColorPanelAllModesMask' value='65535'/>
-  <enum name='NSColorPanelCMYKModeMask' value='4'/>
-  <enum name='NSColorPanelColorListModeMask' value='32'/>
-  <enum name='NSColorPanelCrayonModeMask' value='128'/>
-  <enum name='NSColorPanelCustomPaletteModeMask' value='16'/>
-  <enum name='NSColorPanelGrayModeMask' value='1'/>
-  <enum name='NSColorPanelHSBModeMask' value='8'/>
-  <enum name='NSColorPanelRGBModeMask' value='2'/>
-  <enum name='NSColorPanelWheelModeMask' value='64'/>
-  <enum name='NSColorRenderingIntentAbsoluteColorimetric' value='1'/>
-  <enum name='NSColorRenderingIntentDefault' value='0'/>
-  <enum name='NSColorRenderingIntentPerceptual' value='3'/>
-  <enum name='NSColorRenderingIntentRelativeColorimetric' value='2'/>
-  <enum name='NSColorRenderingIntentSaturation' value='4'/>
-  <enum name='NSCommandKeyMask' value='1048576'/>
-  <enum name='NSCompositeClear' value='0'/>
-  <enum name='NSCompositeCopy' value='1'/>
-  <enum name='NSCompositeDestinationAtop' value='9'/>
-  <enum name='NSCompositeDestinationIn' value='7'/>
-  <enum name='NSCompositeDestinationOut' value='8'/>
-  <enum name='NSCompositeDestinationOver' value='6'/>
-  <enum name='NSCompositeHighlight' value='12'/>
-  <enum name='NSCompositePlusDarker' value='11'/>
-  <enum name='NSCompositePlusLighter' value='13'/>
-  <enum name='NSCompositeSourceAtop' value='5'/>
-  <enum name='NSCompositeSourceIn' value='3'/>
-  <enum name='NSCompositeSourceOut' value='4'/>
-  <enum name='NSCompositeSourceOver' value='2'/>
-  <enum name='NSCompositeXOR' value='10'/>
-  <enum name='NSCompressedFontMask' value='512'/>
-  <enum name='NSCondensedFontMask' value='64'/>
-  <enum name='NSContentsCellMask' value='1'/>
-  <enum name='NSContinuousCapacityLevelIndicatorStyle' value='1'/>
-  <enum name='NSControlGlyph' value='16777215'/>
-  <enum name='NSControlKeyMask' value='262144'/>
-  <enum name='NSCrayonModeColorPanel' value='7'/>
-  <enum name='NSCriticalAlertStyle' value='2'/>
-  <enum name='NSCriticalRequest' value='0'/>
-  <enum name='NSCursorPointingDevice' value='2'/>
-  <enum name='NSCursorUpdate' value='17'/>
-  <enum name='NSCursorUpdateMask' value='131072'/>
-  <enum name='NSCurveToBezierPathElement' value='2'/>
-  <enum name='NSCustomPaletteModeColorPanel' value='4'/>
-  <enum name='NSDecimalTabStopType' value='3'/>
-  <enum name='NSDefaultControlTint' value='0'/>
-  <enum name='NSDefaultTokenStyle' value='0'/>
-  <enum name='NSDeleteCharFunctionKey' value='63294'/>
-  <enum name='NSDeleteCharacter' value='127'/>
-  <enum name='NSDeleteFunctionKey' value='63272'/>
-  <enum name='NSDeleteLineFunctionKey' value='63292'/>
-  <enum name='NSDescendingPageOrder' value='-1'/>
-  <enum name='NSDeviceIndependentModifierFlagsMask' value='-65536'/>
-  <enum name='NSDeviceNColorSpaceModel' value='4'/>
-  <enum name='NSDirectSelection' value='0'/>
-  <enum name='NSDisclosureBezelStyle' value='5'/>
-  <enum name='NSDiscreteCapacityLevelIndicatorStyle' value='2'/>
-  <enum name='NSDisplayWindowRunLoopOrdering' value='600000'/>
-  <enum name='NSDocModalWindowMask' value='64'/>
-  <enum name='NSDockWindowLevel' value='20'/>
-  <enum name='NSDoubleType' value='6'/>
-  <enum name='NSDownArrowFunctionKey' value='63233'/>
-  <enum name='NSDownTextMovement' value='22'/>
-  <enum name='NSDragOperationAll' value='15'/>
-  <enum name='NSDragOperationAll_Obsolete' value='15'/>
-  <enum name='NSDragOperationCopy' value='1'/>
-  <enum name='NSDragOperationDelete' value='32'/>
-  <enum name='NSDragOperationEvery' value='-1'/>
-  <enum name='NSDragOperationGeneric' value='4'/>
-  <enum name='NSDragOperationLink' value='2'/>
-  <enum name='NSDragOperationMove' value='16'/>
-  <enum name='NSDragOperationNone' value='0'/>
-  <enum name='NSDragOperationPrivate' value='8'/>
-  <enum name='NSDrawerClosedState' value='0'/>
-  <enum name='NSDrawerClosingState' value='3'/>
-  <enum name='NSDrawerOpenState' value='2'/>
-  <enum name='NSDrawerOpeningState' value='1'/>
-  <enum name='NSEndFunctionKey' value='63275'/>
-  <enum name='NSEnterCharacter' value='3'/>
-  <enum name='NSEraDatePickerElementFlag' value='256'/>
-  <enum name='NSEraserPointingDevice' value='3'/>
-  <enum name='NSEvenOddWindingRule' value='1'/>
-  <enum name='NSExclude10_4ElementsIconCreationOption' value='4'/>
-  <enum name='NSExcludeQuickDrawElementsIconCreationOption' value='2'/>
-  <enum name='NSExecuteFunctionKey' value='63298'/>
-  <enum name='NSExpandedFontMask' value='32'/>
-  <enum name='NSF10FunctionKey' value='63245'/>
-  <enum name='NSF11FunctionKey' value='63246'/>
-  <enum name='NSF12FunctionKey' value='63247'/>
-  <enum name='NSF13FunctionKey' value='63248'/>
-  <enum name='NSF14FunctionKey' value='63249'/>
-  <enum name='NSF15FunctionKey' value='63250'/>
-  <enum name='NSF16FunctionKey' value='63251'/>
-  <enum name='NSF17FunctionKey' value='63252'/>
-  <enum name='NSF18FunctionKey' value='63253'/>
-  <enum name='NSF19FunctionKey' value='63254'/>
-  <enum name='NSF1FunctionKey' value='63236'/>
-  <enum name='NSF20FunctionKey' value='63255'/>
-  <enum name='NSF21FunctionKey' value='63256'/>
-  <enum name='NSF22FunctionKey' value='63257'/>
-  <enum name='NSF23FunctionKey' value='63258'/>
-  <enum name='NSF24FunctionKey' value='63259'/>
-  <enum name='NSF25FunctionKey' value='63260'/>
-  <enum name='NSF26FunctionKey' value='63261'/>
-  <enum name='NSF27FunctionKey' value='63262'/>
-  <enum name='NSF28FunctionKey' value='63263'/>
-  <enum name='NSF29FunctionKey' value='63264'/>
-  <enum name='NSF2FunctionKey' value='63237'/>
-  <enum name='NSF30FunctionKey' value='63265'/>
-  <enum name='NSF31FunctionKey' value='63266'/>
-  <enum name='NSF32FunctionKey' value='63267'/>
-  <enum name='NSF33FunctionKey' value='63268'/>
-  <enum name='NSF34FunctionKey' value='63269'/>
-  <enum name='NSF35FunctionKey' value='63270'/>
-  <enum name='NSF3FunctionKey' value='63238'/>
-  <enum name='NSF4FunctionKey' value='63239'/>
-  <enum name='NSF5FunctionKey' value='63240'/>
-  <enum name='NSF6FunctionKey' value='63241'/>
-  <enum name='NSF7FunctionKey' value='63242'/>
-  <enum name='NSF8FunctionKey' value='63243'/>
-  <enum name='NSF9FunctionKey' value='63244'/>
-  <enum name='NSFPCurrentField' value='134'/>
-  <enum name='NSFPPreviewButton' value='131'/>
-  <enum name='NSFPPreviewField' value='128'/>
-  <enum name='NSFPRevertButton' value='130'/>
-  <enum name='NSFPSetButton' value='132'/>
-  <enum name='NSFPSizeField' value='129'/>
-  <enum name='NSFPSizeTitle' value='133'/>
-  <enum name='NSFileHandlingPanelCancelButton' value='0'/>
-  <enum name='NSFileHandlingPanelOKButton' value='1'/>
-  <enum name='NSFindFunctionKey' value='63301'/>
-  <enum name='NSFindPanelActionNext' value='2'/>
-  <enum name='NSFindPanelActionPrevious' value='3'/>
-  <enum name='NSFindPanelActionReplace' value='5'/>
-  <enum name='NSFindPanelActionReplaceAll' value='4'/>
-  <enum name='NSFindPanelActionReplaceAllInSelection' value='8'/>
-  <enum name='NSFindPanelActionReplaceAndFind' value='6'/>
-  <enum name='NSFindPanelActionSelectAll' value='9'/>
-  <enum name='NSFindPanelActionSelectAllInSelection' value='10'/>
-  <enum name='NSFindPanelActionSetFindString' value='7'/>
-  <enum name='NSFindPanelActionShowFindPanel' value='1'/>
-  <enum name='NSFindPanelSubstringMatchTypeContains' value='0'/>
-  <enum name='NSFindPanelSubstringMatchTypeEndsWith' value='3'/>
-  <enum name='NSFindPanelSubstringMatchTypeFullWord' value='2'/>
-  <enum name='NSFindPanelSubstringMatchTypeStartsWith' value='1'/>
-  <enum name='NSFitPagination' value='1'/>
-  <enum name='NSFixedPitchFontMask' value='1024'/>
-  <enum name='NSFlagsChanged' value='12'/>
-  <enum name='NSFlagsChangedMask' value='4096'/>
-  <enum name='NSFloatType' value='3'/>
-  <enum name='NSFloatingPointSamplesBitmapFormat' value='4'/>
-  <enum name='NSFloatingWindowLevel' value='3'/>
-  <enum name='NSFocusRingAbove' value='2'/>
-  <enum name='NSFocusRingBelow' value='1'/>
-  <enum name='NSFocusRingOnly' value='0'/>
-  <enum name='NSFocusRingTypeDefault' value='0'/>
-  <enum name='NSFocusRingTypeExterior' value='2'/>
-  <enum name='NSFocusRingTypeNone' value='1'/>
-  <enum name='NSFontAntialiasedIntegerAdvancementsRenderingMode' value='3'/>
-  <enum name='NSFontAntialiasedRenderingMode' value='1'/>
-  <enum name='NSFontBoldTrait' value='2'/>
-  <enum name='NSFontClarendonSerifsClass' value='1073741824'/>
-  <enum name='NSFontCollectionApplicationOnlyMask' value='1'/>
-  <enum name='NSFontCondensedTrait' value='64'/>
-  <enum name='NSFontDefaultRenderingMode' value='0'/>
-  <enum name='NSFontExpandedTrait' value='32'/>
-  <enum name='NSFontFamilyClassMask' value='-268435456'/>
-  <enum name='NSFontFreeformSerifsClass' value='1879048192'/>
-  <enum name='NSFontIntegerAdvancementsRenderingMode' value='2'/>
-  <enum name='NSFontItalicTrait' value='1'/>
-  <enum name='NSFontModernSerifsClass' value='805306368'/>
-  <enum name='NSFontMonoSpaceTrait' value='1024'/>
-  <enum name='NSFontOldStyleSerifsClass' value='268435456'/>
-  <enum name='NSFontOrnamentalsClass' value='-1879048192'/>
-  <enum name='NSFontPanelAllEffectsModeMask' value='1048320'/>
-  <enum name='NSFontPanelAllModesMask' value='-1'/>
-  <enum name='NSFontPanelCollectionModeMask' value='4'/>
-  <enum name='NSFontPanelDocumentColorEffectModeMask' value='2048'/>
-  <enum name='NSFontPanelFaceModeMask' value='1'/>
-  <enum name='NSFontPanelShadowEffectModeMask' value='4096'/>
-  <enum name='NSFontPanelSizeModeMask' value='2'/>
-  <enum name='NSFontPanelStandardModesMask' value='65535'/>
-  <enum name='NSFontPanelStrikethroughEffectModeMask' value='512'/>
-  <enum name='NSFontPanelTextColorEffectModeMask' value='1024'/>
-  <enum name='NSFontPanelUnderlineEffectModeMask' value='256'/>
-  <enum name='NSFontSansSerifClass' value='-2147483648'/>
-  <enum name='NSFontScriptsClass' value='-1610612736'/>
-  <enum name='NSFontSlabSerifsClass' value='1342177280'/>
-  <enum name='NSFontSymbolicClass' value='-1073741824'/>
-  <enum name='NSFontTransitionalSerifsClass' value='536870912'/>
-  <enum name='NSFontUIOptimizedTrait' value='4096'/>
-  <enum name='NSFontUnknownClass' value='0'/>
-  <enum name='NSFontVerticalTrait' value='2048'/>
-  <enum name='NSFormFeedCharacter' value='12'/>
-  <enum name='NSFunctionKeyMask' value='8388608'/>
-  <enum name='NSGIFFileType' value='2'/>
-  <enum name='NSGlyphAttributeBidiLevel' value='2'/>
-  <enum name='NSGlyphAttributeElastic' value='1'/>
-  <enum name='NSGlyphAttributeInscribe' value='5'/>
-  <enum name='NSGlyphAttributeSoft' value='0'/>
-  <enum name='NSGlyphInscribeAbove' value='2'/>
-  <enum name='NSGlyphInscribeBase' value='0'/>
-  <enum name='NSGlyphInscribeBelow' value='1'/>
-  <enum name='NSGlyphInscribeOverBelow' value='4'/>
-  <enum name='NSGlyphInscribeOverstrike' value='3'/>
-  <enum name='NSGradientConcaveStrong' value='2'/>
-  <enum name='NSGradientConcaveWeak' value='1'/>
-  <enum name='NSGradientConvexStrong' value='4'/>
-  <enum name='NSGradientConvexWeak' value='3'/>
-  <enum name='NSGradientDrawsAfterEndingLocation' value='2'/>
-  <enum name='NSGradientDrawsBeforeStartingLocation' value='1'/>
-  <enum name='NSGradientNone' value='0'/>
-  <enum name='NSGraphiteControlTint' value='6'/>
-  <enum name='NSGrayColorSpaceModel' value='0'/>
-  <enum name='NSGrayModeColorPanel' value='0'/>
-  <enum name='NSGrooveBorder' value='3'/>
-  <enum name='NSHSBModeColorPanel' value='3'/>
-  <enum name='NSHUDWindowMask' value='8192'/>
-  <enum name='NSHeavierFontAction' value='5'/>
-  <enum name='NSHelpButtonBezelStyle' value='9'/>
-  <enum name='NSHelpFunctionKey' value='63302'/>
-  <enum name='NSHelpKeyMask' value='4194304'/>
-  <enum name='NSHighlightModeMatrix' value='1'/>
-  <enum name='NSHomeFunctionKey' value='63273'/>
-  <enum name='NSHorizontalRuler' value='0'/>
-  <enum name='NSHourMinuteDatePickerElementFlag' value='12'/>
-  <enum name='NSHourMinuteSecondDatePickerElementFlag' value='14'/>
-  <enum name='NSIdentityMappingCharacterCollection' value='0'/>
-  <enum name='NSIllegalTextMovement' value='0'/>
-  <enum name='NSImageAbove' value='5'/>
-  <enum name='NSImageAlignBottom' value='5'/>
-  <enum name='NSImageAlignBottomLeft' value='6'/>
-  <enum name='NSImageAlignBottomRight' value='7'/>
-  <enum name='NSImageAlignCenter' value='0'/>
-  <enum name='NSImageAlignLeft' value='4'/>
-  <enum name='NSImageAlignRight' value='8'/>
-  <enum name='NSImageAlignTop' value='1'/>
-  <enum name='NSImageAlignTopLeft' value='2'/>
-  <enum name='NSImageAlignTopRight' value='3'/>
-  <enum name='NSImageBelow' value='4'/>
-  <enum name='NSImageCacheAlways' value='1'/>
-  <enum name='NSImageCacheBySize' value='2'/>
-  <enum name='NSImageCacheDefault' value='0'/>
-  <enum name='NSImageCacheNever' value='3'/>
-  <enum name='NSImageCellType' value='2'/>
-  <enum name='NSImageFrameButton' value='4'/>
-  <enum name='NSImageFrameGrayBezel' value='2'/>
-  <enum name='NSImageFrameGroove' value='3'/>
-  <enum name='NSImageFrameNone' value='0'/>
-  <enum name='NSImageFramePhoto' value='1'/>
-  <enum name='NSImageInterpolationDefault' value='0'/>
-  <enum name='NSImageInterpolationHigh' value='3'/>
-  <enum name='NSImageInterpolationLow' value='2'/>
-  <enum name='NSImageInterpolationNone' value='1'/>
-  <enum name='NSImageLeft' value='2'/>
-  <enum name='NSImageLoadStatusCancelled' value='1'/>
-  <enum name='NSImageLoadStatusCompleted' value='0'/>
-  <enum name='NSImageLoadStatusInvalidData' value='2'/>
-  <enum name='NSImageLoadStatusReadError' value='4'/>
-  <enum name='NSImageLoadStatusUnexpectedEOF' value='3'/>
-  <enum name='NSImageOnly' value='1'/>
-  <enum name='NSImageOverlaps' value='6'/>
-  <enum name='NSImageRepLoadStatusCompleted' value='-6'/>
-  <enum name='NSImageRepLoadStatusInvalidData' value='-4'/>
-  <enum name='NSImageRepLoadStatusReadingHeader' value='-2'/>
-  <enum name='NSImageRepLoadStatusUnexpectedEOF' value='-5'/>
-  <enum name='NSImageRepLoadStatusUnknownType' value='-1'/>
-  <enum name='NSImageRepLoadStatusWillNeedAllData' value='-3'/>
-  <enum name='NSImageRepMatchesDevice' value='0'/>
-  <enum name='NSImageRight' value='3'/>
-  <enum name='NSImageScaleAxesIndependently' value='1'/>
-  <enum name='NSImageScaleNone' value='2'/>
-  <enum name='NSImageScaleProportionallyDown' value='0'/>
-  <enum name='NSImageScaleProportionallyUpOrDown' value='3'/>
-  <enum name='NSIndexedColorSpaceModel' value='5'/>
-  <enum name='NSInformationalAlertStyle' value='1'/>
-  <enum name='NSInformationalRequest' value='10'/>
-  <enum name='NSInsertCharFunctionKey' value='63293'/>
-  <enum name='NSInsertFunctionKey' value='63271'/>
-  <enum name='NSInsertLineFunctionKey' value='63291'/>
-  <enum name='NSIntType' value='1'/>
-  <enum name='NSItalicFontMask' value='1'/>
-  <enum name='NSJPEG2000FileType' value='5'/>
-  <enum name='NSJPEGFileType' value='3'/>
-  <enum name='NSJustifiedTextAlignment' value='3'/>
-  <enum name='NSKeyDown' value='10'/>
-  <enum name='NSKeyDownMask' value='1024'/>
-  <enum name='NSKeyUp' value='11'/>
-  <enum name='NSKeyUpMask' value='2048'/>
-  <enum name='NSLABColorSpaceModel' value='3'/>
-  <enum name='NSLandscapeOrientation' value='1'/>
-  <enum name='NSLeftArrowFunctionKey' value='63234'/>
-  <enum name='NSLeftMouseDown' value='1'/>
-  <enum name='NSLeftMouseDownMask' value='2'/>
-  <enum name='NSLeftMouseDragged' value='6'/>
-  <enum name='NSLeftMouseDraggedMask' value='64'/>
-  <enum name='NSLeftMouseUp' value='2'/>
-  <enum name='NSLeftMouseUpMask' value='4'/>
-  <enum name='NSLeftTabStopType' value='0'/>
-  <enum name='NSLeftTabsBezelBorder' value='1'/>
-  <enum name='NSLeftTextAlignment' value='0'/>
-  <enum name='NSLeftTextMovement' value='19'/>
-  <enum name='NSLighterFontAction' value='6'/>
-  <enum name='NSLineBorder' value='1'/>
-  <enum name='NSLineBreakByCharWrapping' value='1'/>
-  <enum name='NSLineBreakByClipping' value='2'/>
-  <enum name='NSLineBreakByTruncatingHead' value='3'/>
-  <enum name='NSLineBreakByTruncatingMiddle' value='5'/>
-  <enum name='NSLineBreakByTruncatingTail' value='4'/>
-  <enum name='NSLineBreakByWordWrapping' value='0'/>
-  <enum name='NSLineDoesntMove' value='0'/>
-  <enum name='NSLineMovesDown' value='3'/>
-  <enum name='NSLineMovesLeft' value='1'/>
-  <enum name='NSLineMovesRight' value='2'/>
-  <enum name='NSLineMovesUp' value='4'/>
-  <enum name='NSLineSeparatorCharacter' value='8232'/>
-  <enum name='NSLineSweepDown' value='2'/>
-  <enum name='NSLineSweepLeft' value='0'/>
-  <enum name='NSLineSweepRight' value='1'/>
-  <enum name='NSLineSweepUp' value='3'/>
-  <enum name='NSLineToBezierPathElement' value='1'/>
-  <enum name='NSLinearSlider' value='0'/>
-  <enum name='NSListModeMatrix' value='2'/>
-  <enum name='NSMacintoshInterfaceStyle' value='3'/>
-  <enum name='NSMainMenuWindowLevel' value='24'/>
-  <enum name='NSMenuFunctionKey' value='63285'/>
-  <enum name='NSMiniControlSize' value='2'/>
-  <enum name='NSMiniaturizableWindowMask' value='4'/>
-  <enum name='NSMiterLineJoinStyle' value='0'/>
-  <enum name='NSMixedState' value='-1'/>
-  <enum name='NSModalPanelWindowLevel' value='8'/>
-  <enum name='NSModeSwitchFunctionKey' value='63303'/>
-  <enum name='NSMomentaryChangeButton' value='5'/>
-  <enum name='NSMomentaryLight' value='7'/>
-  <enum name='NSMomentaryLightButton' value='0'/>
-  <enum name='NSMomentaryPushButton' value='0'/>
-  <enum name='NSMomentaryPushInButton' value='7'/>
-  <enum name='NSMouseEntered' value='8'/>
-  <enum name='NSMouseEnteredMask' value='256'/>
-  <enum name='NSMouseEventSubtype' value='0'/>
-  <enum name='NSMouseExited' value='9'/>
-  <enum name='NSMouseExitedMask' value='512'/>
-  <enum name='NSMouseMoved' value='5'/>
-  <enum name='NSMouseMovedMask' value='32'/>
-  <enum name='NSMoveToBezierPathElement' value='0'/>
-  <enum name='NSNarrowFontMask' value='16'/>
-  <enum name='NSNativeShortGlyphPacking' value='5'/>
-  <enum name='NSNaturalTextAlignment' value='4'/>
-  <enum name='NSNewlineCharacter' value='10'/>
-  <enum name='NSNextFunctionKey' value='63296'/>
-  <enum name='NSNextStepInterfaceStyle' value='1'/>
-  <enum name='NSNoBorder' value='0'/>
-  <enum name='NSNoCellMask' value='0'/>
-  <enum name='NSNoFontChangeAction' value='0'/>
-  <enum name='NSNoImage' value='0'/>
-  <enum name='NSNoInterfaceStyle' value='0'/>
-  <enum name='NSNoModeColorPanel' value='-1'/>
-  <enum name='NSNoScrollerParts' value='0'/>
-  <enum name='NSNoTabsBezelBorder' value='4'/>
-  <enum name='NSNoTabsLineBorder' value='5'/>
-  <enum name='NSNoTabsNoBorder' value='6'/>
-  <enum name='NSNoTitle' value='0'/>
-  <enum name='NSNoUnderlineStyle' value='0'/>
-  <enum name='NSNonStandardCharacterSetFontMask' value='8'/>
-  <enum name='NSNonZeroWindingRule' value='0'/>
-  <enum name='NSNonactivatingPanelMask' value='128'/>
-  <enum name='NSNormalWindowLevel' value='0'/>
-  <enum name='NSNullCellType' value='0'/>
-  <enum name='NSNullGlyph' value='0'/>
-  <enum name='NSNumericPadKeyMask' value='2097152'/>
-  <enum name='NSOKButton' value='1'/>
-  <enum name='NSOPENGL_CURRENT_VERSION' value='1'/>
-  <enum name='NSOffState' value='0'/>
-  <enum name='NSOnOffButton' value='6'/>
-  <enum name='NSOnState' value='1'/>
-  <enum name='NSOnlyScrollerArrows' value='1'/>
-  <enum name='NSOpenGLCPRasterizationEnable' value='221'/>
-  <enum name='NSOpenGLCPStateValidation' value='301'/>
-  <enum name='NSOpenGLCPSurfaceOpacity' value='236'/>
-  <enum name='NSOpenGLCPSurfaceOrder' value='235'/>
-  <enum name='NSOpenGLCPSwapInterval' value='222'/>
-  <enum name='NSOpenGLCPSwapRectangle' value='200'/>
-  <enum name='NSOpenGLCPSwapRectangleEnable' value='201'/>
-  <enum name='NSOpenGLGOClearFormatCache' value='502'/>
-  <enum name='NSOpenGLGOFormatCacheSize' value='501'/>
-  <enum name='NSOpenGLGOResetLibrary' value='504'/>
-  <enum name='NSOpenGLGORetainRenderers' value='503'/>
-  <enum name='NSOpenGLPFAAccelerated' value='73'/>
-  <enum name='NSOpenGLPFAAccumSize' value='14'/>
-  <enum name='NSOpenGLPFAAllRenderers' value='1'/>
-  <enum name='NSOpenGLPFAAllowOfflineRenderers' value='96'/>
-  <enum name='NSOpenGLPFAAlphaSize' value='11'/>
-  <enum name='NSOpenGLPFAAuxBuffers' value='7'/>
-  <enum name='NSOpenGLPFAAuxDepthStencil' value='57'/>
-  <enum name='NSOpenGLPFABackingStore' value='76'/>
-  <enum name='NSOpenGLPFAClosestPolicy' value='74'/>
-  <enum name='NSOpenGLPFAColorFloat' value='58'/>
-  <enum name='NSOpenGLPFAColorSize' value='8'/>
-  <enum name='NSOpenGLPFACompliant' value='83'/>
-  <enum name='NSOpenGLPFADepthSize' value='12'/>
-  <enum name='NSOpenGLPFADoubleBuffer' value='5'/>
-  <enum name='NSOpenGLPFAFullScreen' value='54'/>
-  <enum name='NSOpenGLPFAMPSafe' value='78'/>
-  <enum name='NSOpenGLPFAMaximumPolicy' value='52'/>
-  <enum name='NSOpenGLPFAMinimumPolicy' value='51'/>
-  <enum name='NSOpenGLPFAMultiScreen' value='81'/>
-  <enum name='NSOpenGLPFAMultisample' value='59'/>
-  <enum name='NSOpenGLPFANoRecovery' value='72'/>
-  <enum name='NSOpenGLPFAOffScreen' value='53'/>
-  <enum name='NSOpenGLPFAPixelBuffer' value='90'/>
-  <enum name='NSOpenGLPFARendererID' value='70'/>
-  <enum name='NSOpenGLPFARobust' value='75'/>
-  <enum name='NSOpenGLPFASampleAlpha' value='61'/>
-  <enum name='NSOpenGLPFASampleBuffers' value='55'/>
-  <enum name='NSOpenGLPFASamples' value='56'/>
-  <enum name='NSOpenGLPFAScreenMask' value='84'/>
-  <enum name='NSOpenGLPFASingleRenderer' value='71'/>
-  <enum name='NSOpenGLPFAStencilSize' value='13'/>
-  <enum name='NSOpenGLPFAStereo' value='6'/>
-  <enum name='NSOpenGLPFASupersample' value='60'/>
-  <enum name='NSOpenGLPFAVirtualScreenCount' value='128'/>
-  <enum name='NSOpenGLPFAWindow' value='80'/>
-  <enum name='NSOtherMouseDown' value='25'/>
-  <enum name='NSOtherMouseDownMask' value='33554432'/>
-  <enum name='NSOtherMouseDragged' value='27'/>
-  <enum name='NSOtherMouseDraggedMask' value='134217728'/>
-  <enum name='NSOtherMouseUp' value='26'/>
-  <enum name='NSOtherMouseUpMask' value='67108864'/>
-  <enum name='NSOtherTextMovement' value='0'/>
-  <enum name='NSOutlineViewDropOnItemIndex' value='-1'/>
-  <enum name='NSPNGFileType' value='4'/>
-  <enum name='NSPageDownFunctionKey' value='63277'/>
-  <enum name='NSPageUpFunctionKey' value='63276'/>
-  <enum name='NSParagraphSeparatorCharacter' value='8233'/>
-  <enum name='NSPathStyleNavigationBar' value='1'/>
-  <enum name='NSPathStylePopUp' value='2'/>
-  <enum name='NSPathStyleStandard' value='0'/>
-  <enum name='NSPatternColorSpaceModel' value='6'/>
-  <enum name='NSPauseFunctionKey' value='63280'/>
-  <enum name='NSPenLowerSideMask' value='2'/>
-  <enum name='NSPenPointingDevice' value='1'/>
-  <enum name='NSPenTipMask' value='1'/>
-  <enum name='NSPenUpperSideMask' value='4'/>
-  <enum name='NSPeriodic' value='16'/>
-  <enum name='NSPeriodicMask' value='65536'/>
-  <enum name='NSPlainTextTokenStyle' value='1'/>
-  <enum name='NSPopUpArrowAtBottom' value='2'/>
-  <enum name='NSPopUpArrowAtCenter' value='1'/>
-  <enum name='NSPopUpMenuWindowLevel' value='101'/>
-  <enum name='NSPopUpNoArrow' value='0'/>
-  <enum name='NSPortraitOrientation' value='0'/>
-  <enum name='NSPositiveDoubleType' value='7'/>
-  <enum name='NSPositiveFloatType' value='4'/>
-  <enum name='NSPositiveIntType' value='2'/>
-  <enum name='NSPosterFontMask' value='256'/>
-  <enum name='NSPowerOffEventType' value='1'/>
-  <enum name='NSPressedTab' value='2'/>
-  <enum name='NSPrevFunctionKey' value='63295'/>
-  <enum name='NSPrintFunctionKey' value='63288'/>
-  <enum name='NSPrintPanelShowsCopies' value='1'/>
-  <enum name='NSPrintPanelShowsOrientation' value='8'/>
-  <enum name='NSPrintPanelShowsPageRange' value='2'/>
-  <enum name='NSPrintPanelShowsPageSetupAccessory' value='256'/>
-  <enum name='NSPrintPanelShowsPaperSize' value='4'/>
-  <enum name='NSPrintPanelShowsPreview' value='131072'/>
-  <enum name='NSPrintPanelShowsScaling' value='16'/>
-  <enum name='NSPrintScreenFunctionKey' value='63278'/>
-  <enum name='NSPrinterTableError' value='2'/>
-  <enum name='NSPrinterTableNotFound' value='1'/>
-  <enum name='NSPrinterTableOK' value='0'/>
-  <enum name='NSPrintingCancelled' value='0'/>
-  <enum name='NSPrintingFailure' value='3'/>
-  <enum name='NSPrintingReplyLater' value='2'/>
-  <enum name='NSPrintingSuccess' value='1'/>
-  <enum name='NSProgressIndicatorBarStyle' value='0'/>
-  <enum name='NSProgressIndicatorPreferredAquaThickness' value='12'/>
-  <enum name='NSProgressIndicatorPreferredLargeThickness' value='18'/>
-  <enum name='NSProgressIndicatorPreferredSmallThickness' value='10'/>
-  <enum name='NSProgressIndicatorPreferredThickness' value='14'/>
-  <enum name='NSProgressIndicatorSpinningStyle' value='1'/>
-  <enum name='NSPushInCell' value='2'/>
-  <enum name='NSPushInCellMask' value='2'/>
-  <enum name='NSPushOnPushOffButton' value='1'/>
-  <enum name='NSQTMovieLoopingBackAndForthPlayback' value='2'/>
-  <enum name='NSQTMovieLoopingPlayback' value='1'/>
-  <enum name='NSQTMovieNormalPlayback' value='0'/>
-  <enum name='NSRGBColorSpaceModel' value='1'/>
-  <enum name='NSRGBModeColorPanel' value='1'/>
-  <enum name='NSRadioButton' value='4'/>
-  <enum name='NSRadioModeMatrix' value='0'/>
-  <enum name='NSRangeDateMode' value='1'/>
-  <enum name='NSRatingLevelIndicatorStyle' value='3'/>
-  <enum name='NSRecessedBezelStyle' value='13'/>
-  <enum name='NSRedoFunctionKey' value='63300'/>
-  <enum name='NSRegularControlSize' value='0'/>
-  <enum name='NSRegularSquareBezelStyle' value='2'/>
-  <enum name='NSRelevancyLevelIndicatorStyle' value='0'/>
-  <enum name='NSRemoveTraitFontAction' value='7'/>
-  <enum name='NSResetCursorRectsRunLoopOrdering' value='700000'/>
-  <enum name='NSResetFunctionKey' value='63283'/>
-  <enum name='NSResizableWindowMask' value='8'/>
-  <enum name='NSReturnTextMovement' value='16'/>
-  <enum name='NSRightArrowFunctionKey' value='63235'/>
-  <enum name='NSRightMouseDown' value='3'/>
-  <enum name='NSRightMouseDownMask' value='8'/>
-  <enum name='NSRightMouseDragged' value='7'/>
-  <enum name='NSRightMouseDraggedMask' value='128'/>
-  <enum name='NSRightMouseUp' value='4'/>
-  <enum name='NSRightMouseUpMask' value='16'/>
-  <enum name='NSRightTabStopType' value='1'/>
-  <enum name='NSRightTabsBezelBorder' value='3'/>
-  <enum name='NSRightTextAlignment' value='1'/>
-  <enum name='NSRightTextMovement' value='20'/>
-  <enum name='NSRoundLineCapStyle' value='1'/>
-  <enum name='NSRoundLineJoinStyle' value='1'/>
-  <enum name='NSRoundRectBezelStyle' value='12'/>
-  <enum name='NSRoundedBezelStyle' value='1'/>
-  <enum name='NSRoundedDisclosureBezelStyle' value='14'/>
-  <enum name='NSRoundedTokenStyle' value='2'/>
-  <enum name='NSRuleEditorNestingModeCompound' value='2'/>
-  <enum name='NSRuleEditorNestingModeList' value='1'/>
-  <enum name='NSRuleEditorNestingModeSimple' value='3'/>
-  <enum name='NSRuleEditorNestingModeSingle' value='0'/>
-  <enum name='NSRuleEditorRowTypeCompound' value='1'/>
-  <enum name='NSRuleEditorRowTypeSimple' value='0'/>
-  <enum name='NSRunAbortedResponse' value='-1001'/>
-  <enum name='NSRunContinuesResponse' value='-1002'/>
-  <enum name='NSRunStoppedResponse' value='-1000'/>
-  <enum name='NSSaveAsOperation' value='1'/>
-  <enum name='NSSaveOperation' value='0'/>
-  <enum name='NSSaveToOperation' value='2'/>
-  <enum name='NSScaleNone' value='2'/>
-  <enum name='NSScaleProportionally' value='0'/>
-  <enum name='NSScaleToFit' value='1'/>
-  <enum name='NSScreenChangedEventType' value='8'/>
-  <enum name='NSScreenSaverWindowLevel' value='1000'/>
-  <enum name='NSScrollLockFunctionKey' value='63279'/>
-  <enum name='NSScrollWheel' value='22'/>
-  <enum name='NSScrollWheelMask' value='4194304'/>
-  <enum name='NSScrollerArrowsDefaultSetting' value='0'/>
-  <enum name='NSScrollerArrowsMaxEnd' value='0'/>
-  <enum name='NSScrollerArrowsMinEnd' value='1'/>
-  <enum name='NSScrollerArrowsNone' value='2'/>
-  <enum name='NSScrollerDecrementArrow' value='1'/>
-  <enum name='NSScrollerDecrementLine' value='4'/>
-  <enum name='NSScrollerDecrementPage' value='1'/>
-  <enum name='NSScrollerIncrementArrow' value='0'/>
-  <enum name='NSScrollerIncrementLine' value='5'/>
-  <enum name='NSScrollerIncrementPage' value='3'/>
-  <enum name='NSScrollerKnob' value='2'/>
-  <enum name='NSScrollerKnobSlot' value='6'/>
-  <enum name='NSScrollerNoPart' value='0'/>
-  <enum name='NSSearchFieldClearRecentsMenuItemTag' value='1002'/>
-  <enum name='NSSearchFieldNoRecentsMenuItemTag' value='1003'/>
-  <enum name='NSSearchFieldRecentsMenuItemTag' value='1001'/>
-  <enum name='NSSearchFieldRecentsTitleMenuItemTag' value='1000'/>
-  <enum name='NSSegmentStyleAutomatic' value='0'/>
-  <enum name='NSSegmentStyleCapsule' value='5'/>
-  <enum name='NSSegmentStyleRoundRect' value='3'/>
-  <enum name='NSSegmentStyleRounded' value='1'/>
-  <enum name='NSSegmentStyleSmallSquare' value='6'/>
-  <enum name='NSSegmentStyleTexturedRounded' value='2'/>
-  <enum name='NSSegmentStyleTexturedSquare' value='4'/>
-  <enum name='NSSegmentSwitchTrackingMomentary' value='2'/>
-  <enum name='NSSegmentSwitchTrackingSelectAny' value='1'/>
-  <enum name='NSSegmentSwitchTrackingSelectOne' value='0'/>
-  <enum name='NSSelectByCharacter' value='0'/>
-  <enum name='NSSelectByParagraph' value='2'/>
-  <enum name='NSSelectByWord' value='1'/>
-  <enum name='NSSelectFunctionKey' value='63297'/>
-  <enum name='NSSelectedTab' value='0'/>
-  <enum name='NSSelectingNext' value='1'/>
-  <enum name='NSSelectingPrevious' value='2'/>
-  <enum name='NSSelectionAffinityDownstream' value='1'/>
-  <enum name='NSSelectionAffinityUpstream' value='0'/>
-  <enum name='NSServiceApplicationLaunchFailedError' value='66561'/>
-  <enum name='NSServiceApplicationNotFoundError' value='66560'/>
-  <enum name='NSServiceErrorMaximum' value='66817'/>
-  <enum name='NSServiceErrorMinimum' value='66560'/>
-  <enum name='NSServiceInvalidPasteboardDataError' value='66563'/>
-  <enum name='NSServiceMalformedServiceDictionaryError' value='66564'/>
-  <enum name='NSServiceMiscellaneousError' value='66800'/>
-  <enum name='NSServiceRequestTimedOutError' value='66562'/>
-  <enum name='NSShadowlessSquareBezelStyle' value='6'/>
-  <enum name='NSShiftKeyMask' value='131072'/>
-  <enum name='NSShowControlGlyphs' value='1'/>
-  <enum name='NSShowInvisibleGlyphs' value='2'/>
-  <enum name='NSSingleDateMode' value='0'/>
-  <enum name='NSSingleUnderlineStyle' value='1'/>
-  <enum name='NSSizeDownFontAction' value='4'/>
-  <enum name='NSSizeUpFontAction' value='3'/>
-  <enum name='NSSmallCapsFontMask' value='128'/>
-  <enum name='NSSmallControlSize' value='1'/>
-  <enum name='NSSmallIconButtonBezelStyle' value='2'/>
-  <enum name='NSSmallSquareBezelStyle' value='10'/>
-  <enum name='NSSpecialPageOrder' value='0'/>
-  <enum name='NSSpeechImmediateBoundary' value='0'/>
-  <enum name='NSSpeechSentenceBoundary' value='2'/>
-  <enum name='NSSpeechWordBoundary' value='1'/>
-  <enum name='NSSpellingStateGrammarFlag' value='2'/>
-  <enum name='NSSpellingStateSpellingFlag' value='1'/>
-  <enum name='NSSplitViewDividerStyleThick' value='1'/>
-  <enum name='NSSplitViewDividerStyleThin' value='2'/>
-  <enum name='NSSquareLineCapStyle' value='2'/>
-  <enum name='NSSquareStatusItemLength' value='-2'/>
-  <enum name='NSStatusWindowLevel' value='25'/>
-  <enum name='NSStopFunctionKey' value='63284'/>
-  <enum name='NSStringDrawingDisableScreenFontSubstitution' value='4'/>
-  <enum name='NSStringDrawingOneShot' value='16'/>
-  <enum name='NSStringDrawingTruncatesLastVisibleLine' value='32'/>
-  <enum name='NSStringDrawingUsesDeviceMetrics' value='8'/>
-  <enum name='NSStringDrawingUsesFontLeading' value='2'/>
-  <enum name='NSStringDrawingUsesLineFragmentOrigin' value='1'/>
-  <enum name='NSSubmenuWindowLevel' value='3'/>
-  <enum name='NSSwitchButton' value='3'/>
-  <enum name='NSSysReqFunctionKey' value='63281'/>
-  <enum name='NSSystemDefined' value='14'/>
-  <enum name='NSSystemDefinedMask' value='16384'/>
-  <enum name='NSSystemFunctionKey' value='63287'/>
-  <enum name='NSTIFFCompressionCCITTFAX3' value='3'/>
-  <enum name='NSTIFFCompressionCCITTFAX4' value='4'/>
-  <enum name='NSTIFFCompressionJPEG' value='6'/>
-  <enum name='NSTIFFCompressionLZW' value='5'/>
-  <enum name='NSTIFFCompressionNEXT' value='32766'/>
-  <enum name='NSTIFFCompressionNone' value='1'/>
-  <enum name='NSTIFFCompressionOldJPEG' value='32865'/>
-  <enum name='NSTIFFCompressionPackBits' value='32773'/>
-  <enum name='NSTIFFFileType' value='0'/>
-  <enum name='NSTabCharacter' value='9'/>
-  <enum name='NSTabTextMovement' value='17'/>
-  <enum name='NSTableColumnAutoresizingMask' value='1'/>
-  <enum name='NSTableColumnNoResizing' value='0'/>
-  <enum name='NSTableColumnUserResizingMask' value='2'/>
-  <enum name='NSTableViewDropAbove' value='1'/>
-  <enum name='NSTableViewDropOn' value='0'/>
-  <enum name='NSTableViewFirstColumnOnlyAutoresizingStyle' value='5'/>
-  <enum name='NSTableViewGridNone' value='0'/>
-  <enum name='NSTableViewLastColumnOnlyAutoresizingStyle' value='4'/>
-  <enum name='NSTableViewNoColumnAutoresizing' value='0'/>
-  <enum name='NSTableViewReverseSequentialColumnAutoresizingStyle' value='3'/>
-  <enum name='NSTableViewSelectionHighlightStyleRegular' value='0'/>
-  <enum name='NSTableViewSelectionHighlightStyleSourceList' value='1'/>
-  <enum name='NSTableViewSequentialColumnAutoresizingStyle' value='2'/>
-  <enum name='NSTableViewSolidHorizontalGridLineMask' value='2'/>
-  <enum name='NSTableViewSolidVerticalGridLineMask' value='1'/>
-  <enum name='NSTableViewUniformColumnAutoresizingStyle' value='1'/>
-  <enum name='NSTabletPoint' value='23'/>
-  <enum name='NSTabletPointEventSubtype' value='1'/>
-  <enum name='NSTabletPointMask' value='8388608'/>
-  <enum name='NSTabletProximity' value='24'/>
-  <enum name='NSTabletProximityEventSubtype' value='2'/>
-  <enum name='NSTabletProximityMask' value='16777216'/>
-  <enum name='NSTerminateCancel' value='0'/>
-  <enum name='NSTerminateLater' value='2'/>
-  <enum name='NSTerminateNow' value='1'/>
-  <enum name='NSTextBlockAbsoluteValueType' value='0'/>
-  <enum name='NSTextBlockBaselineAlignment' value='3'/>
-  <enum name='NSTextBlockBorder' value='0'/>
-  <enum name='NSTextBlockBottomAlignment' value='2'/>
-  <enum name='NSTextBlockHeight' value='4'/>
-  <enum name='NSTextBlockMargin' value='1'/>
-  <enum name='NSTextBlockMaximumHeight' value='6'/>
-  <enum name='NSTextBlockMaximumWidth' value='2'/>
-  <enum name='NSTextBlockMiddleAlignment' value='1'/>
-  <enum name='NSTextBlockMinimumHeight' value='5'/>
-  <enum name='NSTextBlockMinimumWidth' value='1'/>
-  <enum name='NSTextBlockPadding' value='-1'/>
-  <enum name='NSTextBlockPercentageValueType' value='1'/>
-  <enum name='NSTextBlockTopAlignment' value='0'/>
-  <enum name='NSTextBlockWidth' value='0'/>
-  <enum name='NSTextCellType' value='1'/>
-  <enum name='NSTextFieldAndStepperDatePickerStyle' value='0'/>
-  <enum name='NSTextFieldDatePickerStyle' value='2'/>
-  <enum name='NSTextFieldRoundedBezel' value='1'/>
-  <enum name='NSTextFieldSquareBezel' value='0'/>
-  <enum name='NSTextListPrependEnclosingMarker' value='1'/>
-  <enum name='NSTextReadInapplicableDocumentTypeError' value='65806'/>
-  <enum name='NSTextReadWriteErrorMaximum' value='66303'/>
-  <enum name='NSTextReadWriteErrorMinimum' value='65792'/>
-  <enum name='NSTextStorageEditedAttributes' value='1'/>
-  <enum name='NSTextStorageEditedCharacters' value='2'/>
-  <enum name='NSTextTableAutomaticLayoutAlgorithm' value='0'/>
-  <enum name='NSTextTableFixedLayoutAlgorithm' value='1'/>
-  <enum name='NSTextWriteInapplicableDocumentTypeError' value='66062'/>
-  <enum name='NSTexturedBackgroundWindowMask' value='256'/>
-  <enum name='NSTexturedRoundedBezelStyle' value='11'/>
-  <enum name='NSTexturedSquareBezelStyle' value='8'/>
-  <enum name='NSThickSquareBezelStyle' value='3'/>
-  <enum name='NSThickerSquareBezelStyle' value='4'/>
-  <enum name='NSTickMarkAbove' value='1'/>
-  <enum name='NSTickMarkBelow' value='0'/>
-  <enum name='NSTickMarkLeft' value='1'/>
-  <enum name='NSTickMarkRight' value='0'/>
-  <enum name='NSTimeZoneDatePickerElementFlag' value='16'/>
-  <enum name='NSTitledWindowMask' value='1'/>
-  <enum name='NSToggleButton' value='2'/>
-  <enum name='NSToolbarDisplayModeDefault' value='0'/>
-  <enum name='NSToolbarDisplayModeIconAndLabel' value='1'/>
-  <enum name='NSToolbarDisplayModeIconOnly' value='2'/>
-  <enum name='NSToolbarDisplayModeLabelOnly' value='3'/>
-  <enum name='NSToolbarItemVisibilityPriorityHigh' value='1000'/>
-  <enum name='NSToolbarItemVisibilityPriorityLow' value='-1000'/>
-  <enum name='NSToolbarItemVisibilityPriorityStandard' value='0'/>
-  <enum name='NSToolbarItemVisibilityPriorityUser' value='2000'/>
-  <enum name='NSToolbarSizeModeDefault' value='0'/>
-  <enum name='NSToolbarSizeModeRegular' value='1'/>
-  <enum name='NSToolbarSizeModeSmall' value='2'/>
-  <enum name='NSTopTabsBezelBorder' value='0'/>
-  <enum name='NSTornOffMenuWindowLevel' value='3'/>
-  <enum name='NSTrackModeMatrix' value='3'/>
-  <enum name='NSTrackingActiveAlways' value='128'/>
-  <enum name='NSTrackingActiveInActiveApp' value='64'/>
-  <enum name='NSTrackingActiveInKeyWindow' value='32'/>
-  <enum name='NSTrackingActiveWhenFirstResponder' value='16'/>
-  <enum name='NSTrackingAssumeInside' value='256'/>
-  <enum name='NSTrackingCursorUpdate' value='4'/>
-  <enum name='NSTrackingEnabledDuringMouseDrag' value='1024'/>
-  <enum name='NSTrackingInVisibleRect' value='512'/>
-  <enum name='NSTrackingMouseEnteredAndExited' value='1'/>
-  <enum name='NSTrackingMouseMoved' value='2'/>
-  <enum name='NSTypesetterBehavior_10_2' value='2'/>
-  <enum name='NSTypesetterBehavior_10_2_WithCompatibility' value='1'/>
-  <enum name='NSTypesetterBehavior_10_3' value='3'/>
-  <enum name='NSTypesetterBehavior_10_4' value='4'/>
-  <enum name='NSTypesetterContainerBreakAction' value='32'/>
-  <enum name='NSTypesetterHorizontalTabAction' value='4'/>
-  <enum name='NSTypesetterLatestBehavior' value='-1'/>
-  <enum name='NSTypesetterLineBreakAction' value='8'/>
-  <enum name='NSTypesetterOriginalBehavior' value='0'/>
-  <enum name='NSTypesetterParagraphBreakAction' value='16'/>
-  <enum name='NSTypesetterWhitespaceAction' value='2'/>
-  <enum name='NSTypesetterZeroAdvancementAction' value='1'/>
-  <enum name='NSUnboldFontMask' value='4'/>
-  <enum name='NSUnderlinePatternDash' value='512'/>
-  <enum name='NSUnderlinePatternDashDot' value='768'/>
-  <enum name='NSUnderlinePatternDashDotDot' value='1024'/>
-  <enum name='NSUnderlinePatternDot' value='256'/>
-  <enum name='NSUnderlinePatternSolid' value='0'/>
-  <enum name='NSUnderlineStyleDouble' value='9'/>
-  <enum name='NSUnderlineStyleNone' value='0'/>
-  <enum name='NSUnderlineStyleSingle' value='1'/>
-  <enum name='NSUnderlineStyleThick' value='2'/>
-  <enum name='NSUndoFunctionKey' value='63299'/>
-  <enum name='NSUnifiedTitleAndToolbarWindowMask' value='4096'/>
-  <enum name='NSUnitalicFontMask' value='16777216'/>
-  <enum name='NSUnknownColorSpaceModel' value='-1'/>
-  <enum name='NSUnknownPageOrder' value='2'/>
-  <enum name='NSUnknownPointingDevice' value='0'/>
-  <enum name='NSUnscaledWindowMask' value='2048'/>
-  <enum name='NSUpArrowFunctionKey' value='63232'/>
-  <enum name='NSUpTextMovement' value='21'/>
-  <enum name='NSUpdateWindowsRunLoopOrdering' value='500000'/>
-  <enum name='NSUserFunctionKey' value='63286'/>
-  <enum name='NSUtilityWindowMask' value='16'/>
-  <enum name='NSVariableStatusItemLength' value='-1'/>
-  <enum name='NSVerticalRuler' value='1'/>
-  <enum name='NSViaPanelFontAction' value='1'/>
-  <enum name='NSViewHeightSizable' value='16'/>
-  <enum name='NSViewMaxXMargin' value='4'/>
-  <enum name='NSViewMaxYMargin' value='32'/>
-  <enum name='NSViewMinXMargin' value='1'/>
-  <enum name='NSViewMinYMargin' value='8'/>
-  <enum name='NSViewNotSizable' value='0'/>
-  <enum name='NSViewWidthSizable' value='2'/>
-  <enum name='NSWantsBidiLevels' value='4'/>
-  <enum name='NSWarningAlertStyle' value='0'/>
-  <enum name='NSWheelModeColorPanel' value='6'/>
-  <enum name='NSWindowAbove' value='1'/>
-  <enum name='NSWindowBackingLocationDefault' value='0'/>
-  <enum name='NSWindowBackingLocationMainMemory' value='2'/>
-  <enum name='NSWindowBackingLocationVideoMemory' value='1'/>
-  <enum name='NSWindowBelow' value='-1'/>
-  <enum name='NSWindowCloseButton' value='0'/>
-  <enum name='NSWindowCollectionBehaviorCanJoinAllSpaces' value='1'/>
-  <enum name='NSWindowCollectionBehaviorDefault' value='0'/>
-  <enum name='NSWindowCollectionBehaviorMoveToActiveSpace' value='2'/>
-  <enum name='NSWindowDocumentIconButton' value='4'/>
-  <enum name='NSWindowExposedEventType' value='0'/>
-  <enum name='NSWindowMiniaturizeButton' value='1'/>
-  <enum name='NSWindowMovedEventType' value='4'/>
-  <enum name='NSWindowOut' value='0'/>
-  <enum name='NSWindowSharingNone' value='0'/>
-  <enum name='NSWindowSharingReadOnly' value='1'/>
-  <enum name='NSWindowSharingReadWrite' value='2'/>
-  <enum name='NSWindowToolbarButton' value='3'/>
-  <enum name='NSWindowZoomButton' value='2'/>
-  <enum name='NSWindows95InterfaceStyle' value='2'/>
-  <enum name='NSWorkspaceLaunchAllowingClassicStartup' value='131072'/>
-  <enum name='NSWorkspaceLaunchAndHide' value='1048576'/>
-  <enum name='NSWorkspaceLaunchAndHideOthers' value='2097152'/>
-  <enum name='NSWorkspaceLaunchAndPrint' value='2'/>
-  <enum name='NSWorkspaceLaunchAsync' value='65536'/>
-  <enum name='NSWorkspaceLaunchDefault' value='196608'/>
-  <enum name='NSWorkspaceLaunchInhibitingBackgroundOnly' value='128'/>
-  <enum name='NSWorkspaceLaunchNewInstance' value='524288'/>
-  <enum name='NSWorkspaceLaunchPreferringClassic' value='262144'/>
-  <enum name='NSWorkspaceLaunchWithoutActivation' value='512'/>
-  <enum name='NSWorkspaceLaunchWithoutAddingToRecents' value='256'/>
-  <enum name='NSWritingDirectionLeftToRight' value='0'/>
-  <enum name='NSWritingDirectionNatural' value='-1'/>
-  <enum name='NSWritingDirectionRightToLeft' value='1'/>
-  <enum name='NSYearMonthDatePickerElementFlag' value='192'/>
-  <enum name='NSYearMonthDayDatePickerElementFlag' value='224'/>
-  <function name='NSAccessibilityActionDescription'>
-    <arg name='action' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSAccessibilityPostNotification'>
-    <arg name='element' declared_type='id' type='@'/>
-    <arg name='notification' declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSAccessibilityRaiseBadArgumentException'>
-    <arg name='element' declared_type='id' type='@'/>
-    <arg name='attribute' declared_type='NSString*' type='@'/>
-    <arg name='value' declared_type='id' type='@'/>
-  </function>
-  <function name='NSAccessibilityRoleDescription'>
-    <arg name='role' declared_type='NSString*' type='@'/>
-    <arg name='subrole' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSAccessibilityRoleDescriptionForUIElement'>
-    <arg name='element' declared_type='id' type='@'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSAccessibilityUnignoredAncestor'>
-    <arg name='element' declared_type='id' type='@'/>
-    <retval declared_type='id' type='@'/>
-  </function>
-  <function name='NSAccessibilityUnignoredChildren'>
-    <arg name='originalChildren' declared_type='NSArray*' type='@'/>
-    <retval declared_type='NSArray*' type='@'/>
-  </function>
-  <function name='NSAccessibilityUnignoredChildrenForOnlyChild'>
-    <arg name='originalChild' declared_type='id' type='@'/>
-    <retval declared_type='NSArray*' type='@'/>
-  </function>
-  <function name='NSAccessibilityUnignoredDescendant'>
-    <arg name='element' declared_type='id' type='@'/>
-    <retval declared_type='id' type='@'/>
-  </function>
-  <function name='NSApplicationLoad'>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSApplicationMain'>
-    <arg name='argc' declared_type='int' type='i'/>
-    <arg name='argv' c_array_length_in_arg='0' declared_type='char**' type='^*' const='true' type_modifier='n'/>
-    <retval declared_type='int' type='i'/>
-  </function>
-  <function name='NSAvailableWindowDepths'>
-    <retval declared_type='NSWindowDepth*' type='^i' c_array_delimited_by_null='true' const='true'/>
-  </function>
-  <function name='NSBeep'/>
-  <function name='NSBeginAlertSheet' variadic='true'>
-    <arg name='title' declared_type='NSString*' type='@'/>
-    <arg name='defaultButton' declared_type='NSString*' type='@'/>
-    <arg name='alternateButton' declared_type='NSString*' type='@'/>
-    <arg name='otherButton' declared_type='NSString*' type='@'/>
-    <arg name='docWindow' declared_type='NSWindow*' type='@'/>
-    <arg name='modalDelegate' declared_type='id' type='@'/>
-    <arg sel_of_type='v20@0:4@8i12^v16' name='didEndSelector' declared_type='SEL' type=':' sel_of_type64='v40@0:8@16q24^v32'/>
-    <arg sel_of_type='v20@0:4@8i12^v16' name='didDismissSelector' declared_type='SEL' type=':' sel_of_type64='v36@0:8@16i24^v28'/>
-    <arg name='contextInfo' declared_type='void*' type='^v' type_modifier='n'/>
-    <arg printf_format='true' name='msgFormat' declared_type='NSString*' type='@' type_modifier='n'/>
-  </function>
-  <function name='NSBeginCriticalAlertSheet' variadic='true'>
-    <arg name='title' declared_type='NSString*' type='@'/>
-    <arg name='defaultButton' declared_type='NSString*' type='@'/>
-    <arg name='alternateButton' declared_type='NSString*' type='@'/>
-    <arg name='otherButton' declared_type='NSString*' type='@'/>
-    <arg name='docWindow' declared_type='NSWindow*' type='@'/>
-    <arg name='modalDelegate' declared_type='id' type='@'/>
-    <arg sel_of_type='v20@0:4@8i12^v16' name='didEndSelector' declared_type='SEL' type=':' sel_of_type64='v40@0:8@16q24^v32'/>
-    <arg sel_of_type='v20@0:4@8i12^v16' name='didDismissSelector' declared_type='SEL' type=':' sel_of_type64='v36@0:8@16i24^v28'/>
-    <arg name='contextInfo' declared_type='void*' type='^v' type_modifier='n'/>
-    <arg printf_format='true' name='msgFormat' declared_type='NSString*' type='@' type_modifier='n'/>
-  </function>
-  <function name='NSBeginInformationalAlertSheet' variadic='true'>
-    <arg name='title' declared_type='NSString*' type='@'/>
-    <arg name='defaultButton' declared_type='NSString*' type='@'/>
-    <arg name='alternateButton' declared_type='NSString*' type='@'/>
-    <arg name='otherButton' declared_type='NSString*' type='@'/>
-    <arg name='docWindow' declared_type='NSWindow*' type='@'/>
-    <arg name='modalDelegate' declared_type='id' type='@'/>
-    <arg sel_of_type='v20@0:4@8i12^v16' name='didEndSelector' declared_type='SEL' type=':' sel_of_type64='v40@0:8@16q24^v32'/>
-    <arg sel_of_type='v20@0:4@8i12^v16' name='didDismissSelector' declared_type='SEL' type=':' sel_of_type64='v36@0:8@16i24^v28'/>
-    <arg name='contextInfo' declared_type='void*' type='^v' type_modifier='n'/>
-    <arg printf_format='true' name='msgFormat' declared_type='NSString*' type='@' type_modifier='n'/>
-  </function>
-  <function name='NSBestDepth'>
-    <arg name='colorSpace' declared_type='NSString*' type='@'/>
-    <arg name='bps' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='bpp' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='planar' declared_type='BOOL' type='B'/>
-    <arg name='exactMatch' declared_type='BOOL*' type='^B' type_modifier='o'/>
-    <retval declared_type='NSWindowDepth' type='i'/>
-  </function>
-  <function name='NSBitsPerPixelFromDepth'>
-    <arg name='depth' declared_type='NSWindowDepth' type='i'/>
-    <retval declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSBitsPerSampleFromDepth'>
-    <arg name='depth' declared_type='NSWindowDepth' type='i'/>
-    <retval declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSColorSpaceFromDepth'>
-    <arg name='depth' declared_type='NSWindowDepth' type='i'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSConvertGlyphsToPackedGlyphs'>
-    <arg name='glBuf' c_array_length_in_arg='1' declared_type='NSGlyph*' type='^I' type_modifier='n'/>
-    <arg name='count' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='packing' declared_type='NSMultibyteGlyphPacking' type='I' type64='Q'/>
-    <arg name='packedGlyphs' c_array_length_in_arg='1' declared_type='char*' type='*' c_array_of_variable_length='true' type_modifier='o'/>
-    <retval declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSCopyBits'>
-    <arg name='srcGState' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='srcRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='destPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-  </function>
-  <function name='NSCountWindows'>
-    <arg name='count' null_accepted='false' declared_type='NSInteger*' type='^i' type64='^q' type_modifier='o'/>
-  </function>
-  <function name='NSCountWindowsForContext'>
-    <arg name='context' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='count' null_accepted='false' declared_type='NSInteger*' type='^i' type64='^q' type_modifier='o'/>
-  </function>
-  <function name='NSCreateFileContentsPboardType'>
-    <arg name='fileType' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSCreateFilenamePboardType'>
-    <arg name='fileType' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSDisableScreenUpdates'/>
-  <function name='NSDottedFrameRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSDrawBitmap'>
-    <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='width' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='height' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='bps' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='spp' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='bpp' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='bpr' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='isPlanar' declared_type='BOOL' type='B'/>
-    <arg name='hasAlpha' declared_type='BOOL' type='B'/>
-    <arg name='colorSpaceName' declared_type='NSString*' type='@'/>
-    <arg name='data' declared_type='unsigned char**' type='^*' const='true'/>
-  </function>
-  <function name='NSDrawButton'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSDrawColorTiledRects'>
-    <arg name='boundsRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='sides' c_array_length_in_arg='4' declared_type='NSRectEdge*' type='^i' type64='^Q' const='true' type_modifier='n'/>
-    <arg name='colors' c_array_length_in_arg='4' declared_type='NSColor**' type='^@' type_modifier='n'/>
-    <arg name='count' declared_type='NSInteger' type='i' type64='q'/>
-    <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSDrawDarkBezel'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSDrawGrayBezel'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSDrawGroove'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSDrawLightBezel'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSDrawNinePartImage'>
-    <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='topLeftCorner' declared_type='NSImage*' type='@'/>
-    <arg name='topEdgeFill' declared_type='NSImage*' type='@'/>
-    <arg name='topRightCorner' declared_type='NSImage*' type='@'/>
-    <arg name='leftEdgeFill' declared_type='NSImage*' type='@'/>
-    <arg name='centerFill' declared_type='NSImage*' type='@'/>
-    <arg name='rightEdgeFill' declared_type='NSImage*' type='@'/>
-    <arg name='bottomLeftCorner' declared_type='NSImage*' type='@'/>
-    <arg name='bottomEdgeFill' declared_type='NSImage*' type='@'/>
-    <arg name='bottomRightCorner' declared_type='NSImage*' type='@'/>
-    <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q'/>
-    <arg name='alphaFraction' declared_type='CGFloat' type='f' type64='d'/>
-    <arg name='flipped' declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSDrawThreePartImage'>
-    <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='startCap' declared_type='NSImage*' type='@'/>
-    <arg name='centerFill' declared_type='NSImage*' type='@'/>
-    <arg name='endCap' declared_type='NSImage*' type='@'/>
-    <arg name='vertical' declared_type='BOOL' type='B'/>
-    <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q'/>
-    <arg name='alphaFraction' declared_type='CGFloat' type='f' type64='d'/>
-    <arg name='flipped' declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSDrawTiledRects'>
-    <arg name='boundsRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='sides' c_array_length_in_arg='4' declared_type='NSRectEdge*' type='^i' type64='^Q' const='true' type_modifier='n'/>
-    <arg name='grays' c_array_length_in_arg='4' declared_type='CGFloat*' type='^f' type64='^d' const='true' type_modifier='n'/>
-    <arg name='count' declared_type='NSInteger' type='i' type64='q'/>
-    <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSDrawWhiteBezel'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSDrawWindowBackground'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSEnableScreenUpdates'/>
-  <function name='NSEraseRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSEventMaskFromType' inline='true'>
-    <arg name='type' declared_type='NSEventType' type='I' type64='Q'/>
-    <retval declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSFrameRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSFrameRectWithWidth'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='frameWidth' declared_type='CGFloat' type='f' type64='d'/>
-  </function>
-  <function name='NSFrameRectWithWidthUsingOperation'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='frameWidth' declared_type='CGFloat' type='f' type64='d'/>
-    <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q'/>
-  </function>
-  <function name='NSGetAlertPanel' variadic='true'>
-    <arg name='title' declared_type='NSString*' type='@'/>
-    <arg printf_format='true' name='msgFormat' declared_type='NSString*' type='@'/>
-    <arg name='defaultButton' declared_type='NSString*' type='@'/>
-    <arg name='alternateButton' declared_type='NSString*' type='@'/>
-    <arg name='otherButton' declared_type='NSString*' type='@'/>
-    <retval declared_type='id' type='@'/>
-  </function>
-  <function name='NSGetCriticalAlertPanel' variadic='true'>
-    <arg name='title' declared_type='NSString*' type='@'/>
-    <arg printf_format='true' name='msgFormat' declared_type='NSString*' type='@'/>
-    <arg name='defaultButton' declared_type='NSString*' type='@'/>
-    <arg name='alternateButton' declared_type='NSString*' type='@'/>
-    <arg name='otherButton' declared_type='NSString*' type='@'/>
-    <retval declared_type='id' type='@'/>
-  </function>
-  <function name='NSGetFileType'>
-    <arg name='pboardType' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSGetFileTypes'>
-    <arg name='pboardTypes' declared_type='NSArray*' type='@'/>
-    <retval declared_type='NSArray*' type='@'/>
-  </function>
-  <function name='NSGetInformationalAlertPanel' variadic='true'>
-    <arg name='title' declared_type='NSString*' type='@'/>
-    <arg printf_format='true' name='msgFormat' declared_type='NSString*' type='@'/>
-    <arg name='defaultButton' declared_type='NSString*' type='@'/>
-    <arg name='alternateButton' declared_type='NSString*' type='@'/>
-    <arg name='otherButton' declared_type='NSString*' type='@'/>
-    <retval declared_type='id' type='@'/>
-  </function>
-  <function name='NSGetWindowServerMemory'>
-    <arg name='context' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='virtualMemory' declared_type='NSInteger*' type='^i' type64='^q' type_modifier='o'/>
-    <arg name='windowBackingMemory' declared_type='NSInteger*' type='^i' type64='^q' type_modifier='o'/>
-    <arg name='windowDumpString' declared_type='NSString**' type='^@' type_modifier='o'/>
-    <retval declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSHighlightRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSInterfaceStyleForKey'>
-    <arg name='key' declared_type='NSString*' type='@'/>
-    <arg name='responder' declared_type='NSResponder*' type='@'/>
-    <retval declared_type='NSInterfaceStyle' type='I' type64='Q'/>
-  </function>
-  <function name='NSIsControllerMarker'>
-    <arg name='object' declared_type='id' type='@'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSNumberOfColorComponents'>
-    <arg name='colorSpaceName' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSOpenGLGetOption'>
-    <arg name='pname' declared_type='NSOpenGLGlobalOption' type='i'/>
-    <arg name='param' declared_type='GLint*' type='^i' type_modifier='o'/>
-  </function>
-  <function name='NSOpenGLGetVersion'>
-    <arg name='major' declared_type='GLint*' type='^i' type_modifier='o'/>
-    <arg name='minor' declared_type='GLint*' type='^i' type_modifier='o'/>
-  </function>
-  <function name='NSOpenGLSetOption'>
-    <arg name='pname' declared_type='NSOpenGLGlobalOption' type='i'/>
-    <arg name='param' declared_type='GLint' type='i'/>
-  </function>
-  <function name='NSPerformService'>
-    <arg name='itemName' declared_type='NSString*' type='@'/>
-    <arg name='pboard' declared_type='NSPasteboard*' type='@'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSPlanarFromDepth'>
-    <arg name='depth' declared_type='NSWindowDepth' type='i'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSReadPixel'>
-    <arg name='passedPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    <retval declared_type='NSColor*' type='@'/>
-  </function>
-  <function name='NSRectClip'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSRectClipList'>
-    <arg name='rects' c_array_length_in_arg='1' declared_type='NSRect*' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' const='true' type_modifier='n'/>
-    <arg name='count' declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSRectFill'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSRectFillList'>
-    <arg name='rects' c_array_length_in_arg='1' declared_type='NSRect*' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' const='true' type_modifier='n'/>
-    <arg name='count' declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSRectFillListUsingOperation'>
-    <arg name='rects' c_array_length_in_arg='1' declared_type='NSRect*' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' const='true' type_modifier='n'/>
-    <arg name='count' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q'/>
-  </function>
-  <function name='NSRectFillListWithColors'>
-    <arg name='rects' c_array_length_in_arg='2' declared_type='NSRect*' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' const='true' type_modifier='n'/>
-    <arg name='colors' c_array_length_in_arg='2' declared_type='NSColor**' type='^@' type_modifier='n'/>
-    <arg name='num' declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSRectFillListWithColorsUsingOperation'>
-    <arg name='rects' c_array_length_in_arg='2' declared_type='NSRect*' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' const='true' type_modifier='n'/>
-    <arg name='colors' c_array_length_in_arg='2' declared_type='NSColor**' type='^@' type_modifier='n'/>
-    <arg name='num' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q'/>
-  </function>
-  <function name='NSRectFillListWithGrays'>
-    <arg name='rects' c_array_length_in_arg='2' declared_type='NSRect*' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' const='true' type_modifier='n'/>
-    <arg name='grays' c_array_length_in_arg='2' declared_type='CGFloat*' type='^f' type64='^d' const='true' type_modifier='n'/>
-    <arg name='num' declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSRectFillUsingOperation'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q'/>
-  </function>
-  <function name='NSRegisterServicesProvider'>
-    <arg name='provider' declared_type='id' type='@'/>
-    <arg name='name' declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSReleaseAlertPanel'>
-    <arg name='panel' declared_type='id' type='@'/>
-  </function>
-  <function name='NSRunAlertPanel' variadic='true'>
-    <arg name='title' declared_type='NSString*' type='@'/>
-    <arg printf_format='true' name='msgFormat' declared_type='NSString*' type='@'/>
-    <arg name='defaultButton' declared_type='NSString*' type='@'/>
-    <arg name='alternateButton' declared_type='NSString*' type='@'/>
-    <arg name='otherButton' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSRunAlertPanelRelativeToWindow' variadic='true'>
-    <arg name='title' declared_type='NSString*' type='@'/>
-    <arg printf_format='true' name='msgFormat' declared_type='NSString*' type='@'/>
-    <arg name='defaultButton' declared_type='NSString*' type='@'/>
-    <arg name='alternateButton' declared_type='NSString*' type='@'/>
-    <arg name='otherButton' declared_type='NSString*' type='@'/>
-    <arg name='docWindow' declared_type='NSWindow*' type='@'/>
-    <retval declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSRunCriticalAlertPanel' variadic='true'>
-    <arg name='title' declared_type='NSString*' type='@'/>
-    <arg printf_format='true' name='msgFormat' declared_type='NSString*' type='@'/>
-    <arg name='defaultButton' declared_type='NSString*' type='@'/>
-    <arg name='alternateButton' declared_type='NSString*' type='@'/>
-    <arg name='otherButton' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSRunCriticalAlertPanelRelativeToWindow' variadic='true'>
-    <arg name='title' declared_type='NSString*' type='@'/>
-    <arg printf_format='true' name='msgFormat' declared_type='NSString*' type='@'/>
-    <arg name='defaultButton' declared_type='NSString*' type='@'/>
-    <arg name='alternateButton' declared_type='NSString*' type='@'/>
-    <arg name='otherButton' declared_type='NSString*' type='@'/>
-    <arg name='docWindow' declared_type='NSWindow*' type='@'/>
-    <retval declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSRunInformationalAlertPanel' variadic='true'>
-    <arg name='title' declared_type='NSString*' type='@'/>
-    <arg printf_format='true' name='msgFormat' declared_type='NSString*' type='@'/>
-    <arg name='defaultButton' declared_type='NSString*' type='@'/>
-    <arg name='alternateButton' declared_type='NSString*' type='@'/>
-    <arg name='otherButton' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSRunInformationalAlertPanelRelativeToWindow' variadic='true'>
-    <arg name='title' declared_type='NSString*' type='@'/>
-    <arg printf_format='true' name='msgFormat' declared_type='NSString*' type='@'/>
-    <arg name='defaultButton' declared_type='NSString*' type='@'/>
-    <arg name='alternateButton' declared_type='NSString*' type='@'/>
-    <arg name='otherButton' declared_type='NSString*' type='@'/>
-    <arg name='docWindow' declared_type='NSWindow*' type='@'/>
-    <retval declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSSetFocusRingStyle'>
-    <arg name='placement' declared_type='NSFocusRingPlacement' type='I' type64='Q'/>
-  </function>
-  <function name='NSSetShowsServicesMenuItem'>
-    <arg name='itemName' declared_type='NSString*' type='@'/>
-    <arg name='enabled' declared_type='BOOL' type='B'/>
-    <retval declared_type='NSInteger' type='i' type64='q'/>
-  </function>
-  <function name='NSShowAnimationEffect'>
-    <arg name='animationEffect' declared_type='NSAnimationEffect' type='I' type64='Q'/>
-    <arg name='centerLocation' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    <arg name='animationDelegate' declared_type='id' type='@'/>
-    <arg sel_of_type='v12@0:4^v8' name='didEndSelector' declared_type='SEL' type=':' sel_of_type64='v24@0:8^v16'/>
-    <arg name='contextInfo' declared_type='void*' type='^v' type_modifier='n'/>
-  </function>
-  <function name='NSShowsServicesMenuItem'>
-    <arg name='itemName' declared_type='NSString*' type='@'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSUnregisterServicesProvider'>
-    <arg name='name' declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSUpdateDynamicServices'/>
-  <function name='NSWindowList'>
-    <arg name='size' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='list' c_array_length_in_arg='0' declared_type='NSInteger*' type='^i' type64='^q' type_modifier='o'/>
-  </function>
-  <function name='NSWindowListForContext'>
-    <arg name='context' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='size' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='list' c_array_length_in_arg='1' declared_type='NSInteger*' type='^i' type64='^q' type_modifier='o'/>
-  </function>
-  <class name='CIColor'>
-    <method selector='initWithColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='CIImage'>
-    <method selector='drawAtPoint:fromRect:operation:fraction:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='fromRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q' index='2'/>
-      <arg name='delta' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawInRect:fromRect:operation:fraction:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='fromRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q' index='2'/>
-      <arg name='delta' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithBitmapImageRep:'>
-      <arg name='bitmapImageRep' declared_type='NSBitmapImageRep*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSATSTypesetter'>
-    <method selector='lineFragmentRectForProposedRect:remainingRect:'>
-      <arg name='proposedRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='remainingRect' declared_type='NSRectPointer' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method class_method='true' selector='sharedTypesetter'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSActionCell'>
-    <method selector='action'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='controlView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='doubleValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='floatValue'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='intValue'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='integerValue'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setAction:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlignment:'>
-      <arg name='mode' declared_type='NSTextAlignment' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBezeled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBordered:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setControlView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFloatingPointFormat:left:right:'>
-      <arg name='autoRange' declared_type='BOOL' type='B' index='0'/>
-      <arg name='leftDigits' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='rightDigits' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObjectValue:'>
-      <arg name='obj' declared_type='id&lt;NSCopying&gt;' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTag:'>
-      <arg name='anInt' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTarget:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stringValue'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='tag'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='target'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSAffineTransform'>
-    <method selector='appendTransform:'>
-      <arg name='transform' declared_type='NSAffineTransform*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='concat'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithTransform:'>
-      <arg name='transform' declared_type='NSAffineTransform*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='invert'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='prependTransform:'>
-      <arg name='transform' declared_type='NSAffineTransform*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rotateByDegrees:'>
-      <arg name='angle' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rotateByRadians:'>
-      <arg name='angle' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scaleBy:'>
-      <arg name='scale' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scaleXBy:yBy:'>
-      <arg name='scaleX' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='scaleY' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='set'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTransformStruct:'>
-      <arg name='transformStruct' declared_type='NSAffineTransformStruct' type='{?=ffffff}' type64='{?=dddddd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='transform'>
-      <retval declared_type='NSAffineTransform*' type='@'/>
-    </method>
-    <method selector='transformBezierPath:'>
-      <arg name='aPath' declared_type='NSBezierPath*' type='@' index='0'/>
-      <retval declared_type='NSBezierPath*' type='@'/>
-    </method>
-    <method selector='transformPoint:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='transformSize:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='transformStruct'>
-      <retval declared_type='NSAffineTransformStruct' type='{?=ffffff}' type64='{?=dddddd}'/>
-    </method>
-    <method selector='translateXBy:yBy:'>
-      <arg name='deltaX' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='deltaY' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSAlert'>
-    <method selector='accessoryView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='addButtonWithTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSButton*' type='@'/>
-    </method>
-    <method selector='alertStyle'>
-      <retval declared_type='NSAlertStyle' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='alertWithError:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <retval declared_type='NSAlert*' type='@'/>
-    </method>
-    <method class_method='true' variadic='true' selector='alertWithMessageText:defaultButton:alternateButton:otherButton:informativeTextWithFormat:'>
-      <arg name='message' declared_type='NSString*' type='@' index='0'/>
-      <arg name='defaultButton' declared_type='NSString*' type='@' index='1'/>
-      <arg name='alternateButton' declared_type='NSString*' type='@' index='2'/>
-      <arg name='otherButton' declared_type='NSString*' type='@' index='3'/>
-      <arg name='informativeTextWithFormat' declared_type='NSString*' type='@' index='4'/>
-      <retval declared_type='NSAlert*' type='@'/>
-    </method>
-    <method selector='beginSheetModalForWindow:modalDelegate:didEndSelector:contextInfo:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='delegate' declared_type='id' type='@' index='1'/>
-      <arg name='didEndSelector' declared_type='SEL' type=':' index='2'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='buttons'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='helpAnchor'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='icon'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='informativeText'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='layout'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='messageText'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='runModal'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setAccessoryView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlertStyle:'>
-      <arg name='style' declared_type='NSAlertStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHelpAnchor:'>
-      <arg name='anchor' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIcon:'>
-      <arg name='icon' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setInformativeText:'>
-      <arg name='informativeText' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMessageText:'>
-      <arg name='messageText' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsHelp:'>
-      <arg name='showsHelp' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsSuppressionButton:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showsHelp'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='showsSuppressionButton'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='suppressionButton'>
-      <retval declared_type='NSButton*' type='@'/>
-    </method>
-    <method selector='window'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSAnimation'>
-    <method selector='addProgressMark:'>
-      <arg name='progressMark' declared_type='NSAnimationProgress' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='animationBlockingMode'>
-      <retval declared_type='NSAnimationBlockingMode' type='I' type64='Q'/>
-    </method>
-    <method selector='animationCurve'>
-      <retval declared_type='NSAnimationCurve' type='I' type64='Q'/>
-    </method>
-    <method selector='clearStartAnimation'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='clearStopAnimation'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='currentProgress'>
-      <retval declared_type='NSAnimationProgress' type='f'/>
-    </method>
-    <method selector='currentValue'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='duration'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='frameRate'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='initWithDuration:animationCurve:'>
-      <arg name='duration' declared_type='NSTimeInterval' type='d' index='0'/>
-      <arg name='animationCurve' declared_type='NSAnimationCurve' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isAnimating'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='progressMarks'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='removeProgressMark:'>
-      <arg name='progressMark' declared_type='NSAnimationProgress' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='runLoopModesForAnimating'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='setAnimationBlockingMode:'>
-      <arg name='animationBlockingMode' declared_type='NSAnimationBlockingMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAnimationCurve:'>
-      <arg name='curve' declared_type='NSAnimationCurve' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCurrentProgress:'>
-      <arg name='progress' declared_type='NSAnimationProgress' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDuration:'>
-      <arg name='duration' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrameRate:'>
-      <arg name='framesPerSecond' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setProgressMarks:'>
-      <arg name='progressMarks' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='startAnimation'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='startWhenAnimation:reachesProgress:'>
-      <arg name='animation' declared_type='NSAnimation*' type='@' index='0'/>
-      <arg name='startProgress' declared_type='NSAnimationProgress' type='f' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopAnimation'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopWhenAnimation:reachesProgress:'>
-      <arg name='animation' declared_type='NSAnimation*' type='@' index='0'/>
-      <arg name='stopProgress' declared_type='NSAnimationProgress' type='f' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSAnimationContext'>
-    <method class_method='true' selector='beginGrouping'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='currentContext'>
-      <retval declared_type='NSAnimationContext*' type='@'/>
-    </method>
-    <method selector='duration'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method class_method='true' selector='endGrouping'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDuration:'>
-      <arg name='duration' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSAppleScript'>
-    <method selector='richTextSource'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSApplication'>
-    <method selector='abortModal'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='activateContextHelpMode:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='activateIgnoringOtherApps:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addWindowsItem:title:filename:'>
-      <arg name='win' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='aString' declared_type='NSString*' type='@' index='1'/>
-      <arg name='isFilename' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationIconImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='arrangeInFront:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='beginModalSessionForWindow:'>
-      <arg name='theWindow' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='NSModalSession' type='^{_NSModalSession=}'/>
-    </method>
-    <method selector='beginModalSessionForWindow:relativeToWindow:'>
-      <arg name='theWindow' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='docWindow' declared_type='NSWindow*' type='@' index='1'/>
-      <retval declared_type='NSModalSession' type='^{_NSModalSession=}'/>
-    </method>
-    <method selector='beginSheet:modalForWindow:modalDelegate:didEndSelector:contextInfo:'>
-      <arg name='sheet' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='docWindow' declared_type='NSWindow*' type='@' index='1'/>
-      <arg name='modalDelegate' declared_type='id' type='@' index='2'/>
-      <arg name='didEndSelector' declared_type='SEL' type=':' index='3'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='cancelUserAttentionRequest:'>
-      <arg name='request' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='changeWindowsItem:title:filename:'>
-      <arg name='win' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='aString' declared_type='NSString*' type='@' index='1'/>
-      <arg name='isFilename' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='context'>
-      <retval declared_type='NSGraphicsContext*' type='@'/>
-    </method>
-    <method selector='currentEvent'>
-      <retval declared_type='NSEvent*' type='@'/>
-    </method>
-    <method selector='deactivate'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='detachDrawingThread:toTarget:withObject:'>
-      <arg name='selector' declared_type='SEL' type=':' index='0'/>
-      <arg name='target' declared_type='id' type='@' index='1'/>
-      <arg name='argument' declared_type='id' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='discardEventsMatchingMask:beforeEvent:'>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='lastEvent' declared_type='NSEvent*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='dockTile'>
-      <retval declared_type='NSDockTile*' type='@'/>
-    </method>
-    <method selector='endModalSession:'>
-      <arg name='session' declared_type='NSModalSession' type='^{_NSModalSession=}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='endSheet:'>
-      <arg name='sheet' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='endSheet:returnCode:'>
-      <arg name='sheet' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='returnCode' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='finishLaunching'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='hide:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='hideOtherApplications:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isActive'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isHidden'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isRunning'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keyWindow'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='mainMenu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='mainWindow'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='makeWindowsPerform:inOrder:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='miniaturizeAll:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='modalWindow'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='nextEventMatchingMask:untilDate:inMode:dequeue:'>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='expiration' declared_type='NSDate*' type='@' index='1'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='2'/>
-      <arg name='deqFlag' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='NSEvent*' type='@'/>
-    </method>
-    <method selector='orderFrontCharacterPalette:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderFrontColorPanel:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderFrontStandardAboutPanel:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderFrontStandardAboutPanelWithOptions:'>
-      <arg name='optionsDictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderedDocuments'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='orderedWindows'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='postEvent:atStart:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='preventWindowOrdering'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='registerServicesMenuSendTypes:returnTypes:'>
-      <arg name='sendTypes' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='returnTypes' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeWindowsItem:'>
-      <arg name='win' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replyToApplicationShouldTerminate:'>
-      <arg name='shouldTerminate' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replyToOpenOrPrint:'>
-      <arg name='reply' declared_type='NSApplicationDelegateReply' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='reportException:'>
-      <arg name='theException' declared_type='NSException*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='requestUserAttention:'>
-      <arg name='requestType' declared_type='NSRequestUserAttentionType' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='run'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='runModalForWindow:'>
-      <arg name='theWindow' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='runModalForWindow:relativeToWindow:'>
-      <arg name='theWindow' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='docWindow' declared_type='NSWindow*' type='@' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='runModalSession:'>
-      <arg name='session' declared_type='NSModalSession' type='^{_NSModalSession=}' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='runPageLayout:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sendAction:to:from:'>
-      <arg name='theAction' declared_type='SEL' type=':' index='0'/>
-      <arg name='theTarget' declared_type='id' type='@' index='1'/>
-      <arg name='sender' declared_type='id' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='sendEvent:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='servicesMenu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='servicesProvider'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setApplicationIconImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMainMenu:'>
-      <arg name='aMenu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setServicesMenu:'>
-      <arg name='aMenu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setServicesProvider:'>
-      <arg name='provider' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWindowsMenu:'>
-      <arg name='aMenu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWindowsNeedUpdate:'>
-      <arg name='needUpdate' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedApplication'>
-      <retval declared_type='NSApplication*' type='@'/>
-    </method>
-    <method selector='showHelp:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stop:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopModal'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopModalWithCode:'>
-      <arg name='returnCode' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='targetForAction:'>
-      <arg name='theAction' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='targetForAction:to:from:'>
-      <arg name='theAction' declared_type='SEL' type=':' index='0'/>
-      <arg name='theTarget' declared_type='id' type='@' index='1'/>
-      <arg name='sender' declared_type='id' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='terminate:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tryToPerform:with:'>
-      <arg name='anAction' declared_type='SEL' type=':' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='unhide:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='unhideAllApplications:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='unhideWithoutActivation'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='updateWindows'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='updateWindowsItem:'>
-      <arg name='win' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='validRequestorForSendType:returnType:'>
-      <arg name='sendType' declared_type='NSString*' type='@' index='0'/>
-      <arg name='returnType' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='windowWithWindowNumber:'>
-      <arg name='windowNum' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='windows'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='windowsMenu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-  </class>
-  <class name='NSArrayController'>
-    <method selector='add:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addObjects:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addSelectedObjects:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='addSelectionIndexes:'>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='alwaysUsesMultipleValuesMarker'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='arrangeObjects:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='arrangedObjects'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='automaticRearrangementKeyPaths'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='automaticallyRearrangesObjects'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='avoidsEmptySelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canInsert'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canSelectNext'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canSelectPrevious'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='clearsFilterPredicateOnInsertion'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='didChangeArrangementCriteria'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='filterPredicate'>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method selector='insert:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertObject:atArrangedObjectIndex:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertObjects:atArrangedObjectIndexes:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='preservesSelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rearrangeObjects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='remove:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectAtArrangedObjectIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjects:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectsAtArrangedObjectIndexes:'>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeSelectedObjects:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='removeSelectionIndexes:'>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectNext:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectPrevious:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedObjects'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='selectionIndex'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='selectionIndexes'>
-      <retval declared_type='NSIndexSet*' type='@'/>
-    </method>
-    <method selector='selectsInsertedObjects'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAlwaysUsesMultipleValuesMarker:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutomaticallyRearrangesObjects:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAvoidsEmptySelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setClearsFilterPredicateOnInsertion:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFilterPredicate:'>
-      <arg name='filterPredicate' declared_type='NSPredicate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPreservesSelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedObjects:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setSelectionIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setSelectionIndexes:'>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setSelectsInsertedObjects:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSortDescriptors:'>
-      <arg name='sortDescriptors' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sortDescriptors'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSAttributedString'>
-    <method selector='RTFDFileWrapperFromRange:documentAttributes:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='dict' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='NSFileWrapper*' type='@'/>
-    </method>
-    <method selector='RTFDFromRange:documentAttributes:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='dict' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='RTFFromRange:documentAttributes:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='dict' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='URLAtIndex:effectiveRange:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='effectiveRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='attribute:atIndex:effectiveRange:'>
-      <arg name='attrName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='attribute:atIndex:longestEffectiveRange:inRange:'>
-      <arg name='attrName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <arg name='rangeLimit' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='attributedStringWithAttachment:'>
-      <arg name='attachment' declared_type='NSTextAttachment*' type='@' index='0'/>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='attributedSubstringFromRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='attributesAtIndex:effectiveRange:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='attributesAtIndex:longestEffectiveRange:inRange:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <arg name='rangeLimit' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='boundingRectWithSize:options:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <arg name='options' declared_type='NSStringDrawingOptions' type='i' type64='q' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='containsAttachments'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='dataFromRange:documentAttributes:error:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='dict' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='docFormatFromRange:documentAttributes:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='dict' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='doubleClickAtIndex:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='drawAtPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawWithRect:options:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='options' declared_type='NSStringDrawingOptions' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='fileWrapperFromRange:documentAttributes:error:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='dict' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='NSFileWrapper*' type='@'/>
-    </method>
-    <method selector='fontAttributesInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='initWithAttributedString:'>
-      <arg name='attrStr' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:options:documentAttributes:error:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='options' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='2'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithDocFormat:documentAttributes:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithHTML:baseURL:documentAttributes:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='base' declared_type='NSURL*' type='@' index='1'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithHTML:documentAttributes:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithHTML:options:documentAttributes:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='options' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithPath:documentAttributes:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithRTF:documentAttributes:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithRTFD:documentAttributes:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithRTFDFileWrapper:documentAttributes:'>
-      <arg name='wrapper' declared_type='NSFileWrapper*' type='@' index='0'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithString:'>
-      <arg name='str' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithString:attributes:'>
-      <arg name='str' declared_type='NSString*' type='@' index='0'/>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithURL:documentAttributes:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithURL:options:documentAttributes:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='options' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='2'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isEqualToAttributedString:'>
-      <arg name='other' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='itemNumberInTextList:atIndex:'>
-      <arg name='list' declared_type='NSTextList*' type='@' index='0'/>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='lineBreakBeforeIndex:withinRange:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='aRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='lineBreakByHyphenatingBeforeIndex:withinRange:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='aRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='nextWordFromIndex:forward:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='isForward' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='rangeOfTextBlock:atIndex:'>
-      <arg name='block' declared_type='NSTextBlock*' type='@' index='0'/>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeOfTextList:atIndex:'>
-      <arg name='list' declared_type='NSTextList*' type='@' index='0'/>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeOfTextTable:atIndex:'>
-      <arg name='table' declared_type='NSTextTable*' type='@' index='0'/>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rulerAttributesInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='size'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='string'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='textFileTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='textPasteboardTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='textTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='textUnfilteredFileTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='textUnfilteredPasteboardTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='textUnfilteredTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSBezierPath'>
-    <method selector='addClip'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendBezierPath:'>
-      <arg name='path' declared_type='NSBezierPath*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendBezierPathWithArcFromPoint:toPoint:radius:'>
-      <arg name='point1' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='point2' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='radius' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:'>
-      <arg name='center' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='radius' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='startAngle' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <arg name='endAngle' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:clockwise:'>
-      <arg name='center' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='radius' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='startAngle' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <arg name='endAngle' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <arg name='clockwise' declared_type='BOOL' type='B' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendBezierPathWithGlyph:inFont:'>
-      <arg name='glyph' declared_type='NSGlyph' type='I' index='0'/>
-      <arg name='font' declared_type='NSFont*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendBezierPathWithGlyphs:count:inFont:'>
-      <arg name='glyphs' declared_type='NSGlyph*' type='^I' index='0'/>
-      <arg name='count' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='font' declared_type='NSFont*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendBezierPathWithOvalInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendBezierPathWithPackedGlyphs:'>
-      <arg name='packedGlyphs' declared_type='char*' type='*' const='true' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendBezierPathWithPoints:count:'>
-      <arg name='points' declared_type='NSPointArray' type='^{_NSPoint=ff}' type64='^{CGPoint=dd}' index='0'/>
-      <arg name='count' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendBezierPathWithRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendBezierPathWithRoundedRect:xRadius:yRadius:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='xRadius' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='yRadius' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='bezierPath'>
-      <retval declared_type='NSBezierPath*' type='@'/>
-    </method>
-    <method selector='bezierPathByFlatteningPath'>
-      <retval declared_type='NSBezierPath*' type='@'/>
-    </method>
-    <method selector='bezierPathByReversingPath'>
-      <retval declared_type='NSBezierPath*' type='@'/>
-    </method>
-    <method class_method='true' selector='bezierPathWithOvalInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSBezierPath*' type='@'/>
-    </method>
-    <method class_method='true' selector='bezierPathWithRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSBezierPath*' type='@'/>
-    </method>
-    <method class_method='true' selector='bezierPathWithRoundedRect:xRadius:yRadius:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='xRadius' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='yRadius' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <retval declared_type='NSBezierPath*' type='@'/>
-    </method>
-    <method selector='bounds'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='cachesBezierPath'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='clipRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='closePath'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='containsPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='controlPointBounds'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='currentPoint'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='curveToPoint:controlPoint1:controlPoint2:'>
-      <arg name='endPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='controlPoint1' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='controlPoint2' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='defaultFlatness'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='defaultLineCapStyle'>
-      <retval declared_type='NSLineCapStyle' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='defaultLineJoinStyle'>
-      <retval declared_type='NSLineJoinStyle' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='defaultLineWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='defaultMiterLimit'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='defaultWindingRule'>
-      <retval declared_type='NSWindingRule' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='drawPackedGlyphs:atPoint:'>
-      <arg name='packedGlyphs' declared_type='char*' type='*' const='true' index='0'/>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='elementAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSBezierPathElement' type='I' type64='Q'/>
-    </method>
-    <method selector='elementAtIndex:associatedPoints:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='points' declared_type='NSPointArray' type='^{_NSPoint=ff}' type64='^{CGPoint=dd}' index='1'/>
-      <retval declared_type='NSBezierPathElement' type='I' type64='Q'/>
-    </method>
-    <method selector='elementCount'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='fill'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='fillRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='flatness'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='getLineDash:count:phase:'>
-      <arg name='pattern' declared_type='CGFloat*' type='^f' type64='^d' index='0'/>
-      <arg name='count' declared_type='NSInteger*' type='^i' type64='^q' index='1'/>
-      <arg name='phase' declared_type='CGFloat*' type='^f' type64='^d' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isEmpty'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='lineCapStyle'>
-      <retval declared_type='NSLineCapStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='lineJoinStyle'>
-      <retval declared_type='NSLineJoinStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='lineToPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='lineWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='miterLimit'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='moveToPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='relativeCurveToPoint:controlPoint1:controlPoint2:'>
-      <arg name='endPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='controlPoint1' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='controlPoint2' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='relativeLineToPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='relativeMoveToPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAllPoints'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAssociatedPoints:atIndex:'>
-      <arg name='points' declared_type='NSPointArray' type='^{_NSPoint=ff}' type64='^{CGPoint=dd}' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCachesBezierPath:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setClip'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setDefaultFlatness:'>
-      <arg name='flatness' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setDefaultLineCapStyle:'>
-      <arg name='lineCapStyle' declared_type='NSLineCapStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setDefaultLineJoinStyle:'>
-      <arg name='lineJoinStyle' declared_type='NSLineJoinStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setDefaultLineWidth:'>
-      <arg name='lineWidth' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setDefaultMiterLimit:'>
-      <arg name='limit' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setDefaultWindingRule:'>
-      <arg name='windingRule' declared_type='NSWindingRule' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFlatness:'>
-      <arg name='flatness' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineCapStyle:'>
-      <arg name='lineCapStyle' declared_type='NSLineCapStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineDash:count:phase:'>
-      <arg name='pattern' declared_type='CGFloat*' type='^f' type64='^d' const='true' index='0'/>
-      <arg name='count' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='phase' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineJoinStyle:'>
-      <arg name='lineJoinStyle' declared_type='NSLineJoinStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineWidth:'>
-      <arg name='lineWidth' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMiterLimit:'>
-      <arg name='miterLimit' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWindingRule:'>
-      <arg name='windingRule' declared_type='NSWindingRule' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stroke'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='strokeLineFromPoint:toPoint:'>
-      <arg name='point1' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='point2' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='strokeRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='transformUsingAffineTransform:'>
-      <arg name='transform' declared_type='NSAffineTransform*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windingRule'>
-      <retval declared_type='NSWindingRule' type='I' type64='Q'/>
-    </method>
-  </class>
-  <class name='NSBitmapImageRep'>
-    <method selector='CGImage'>
-      <retval declared_type='CGImageRef' type='^{CGImage=}'/>
-    </method>
-    <method selector='TIFFRepresentation'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method class_method='true' selector='TIFFRepresentationOfImageRepsInArray:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method class_method='true' selector='TIFFRepresentationOfImageRepsInArray:usingCompression:factor:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='comp' declared_type='NSTIFFCompression' type='I' type64='Q' index='1'/>
-      <arg name='factor' declared_type='float' type='f' index='2'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='TIFFRepresentationUsingCompression:factor:'>
-      <arg name='comp' declared_type='NSTIFFCompression' type='I' type64='Q' index='0'/>
-      <arg name='factor' declared_type='float' type='f' index='1'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='bitmapData'>
-      <retval declared_type='unsigned char*' type='*'/>
-    </method>
-    <method selector='bitmapFormat'>
-      <retval declared_type='NSBitmapFormat' type='I' type64='Q'/>
-    </method>
-    <method selector='bitsPerPixel'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='bytesPerPlane'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='bytesPerRow'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='canBeCompressedUsing:'>
-      <arg name='compression' declared_type='NSTIFFCompression' type='I' type64='Q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='colorAtX:y:'>
-      <arg name='x' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='y' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='colorizeByMappingGray:toColor:blackMapping:whiteMapping:'>
-      <arg name='midPoint' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='midPointColor' declared_type='NSColor*' type='@' index='1'/>
-      <arg name='shadowColor' declared_type='NSColor*' type='@' index='2'/>
-      <arg name='lightColor' declared_type='NSColor*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getBitmapDataPlanes:'>
-      <arg name='data' declared_type='unsigned char**' type='^*' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getCompression:factor:'>
-      <arg name='compression' declared_type='NSTIFFCompression*' type='^I' type64='^Q' index='0'/>
-      <arg name='factor' declared_type='float*' type='^f' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getPixel:atX:y:'>
-      <arg name='p' declared_type='NSUInteger*' type='^I' type64='^Q' index='0'/>
-      <arg name='x' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='y' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='getTIFFCompressionTypes:count:'>
-      <arg name='list' declared_type='NSTIFFCompression**' type='^^I' type64='^^Q' const='true' index='0'/>
-      <arg name='numTypes' declared_type='NSInteger*' type='^i' type64='^q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='imageRepWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='imageRepsWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='incrementalLoadFromData:complete:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='complete' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='initForIncrementalLoad'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bitmapFormat:bytesPerRow:bitsPerPixel:'>
-      <arg name='planes' declared_type='unsigned char**' type='^*' index='0'/>
-      <arg name='width' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='height' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='bps' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <arg name='spp' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <arg name='alpha' declared_type='BOOL' type='B' index='5'/>
-      <arg name='isPlanar' declared_type='BOOL' type='B' index='6'/>
-      <arg name='colorSpaceName' declared_type='NSString*' type='@' index='7'/>
-      <arg name='bitmapFormat' declared_type='NSBitmapFormat' type='I' type64='Q' index='8'/>
-      <arg name='rBytes' declared_type='NSInteger' type='i' type64='q' index='9'/>
-      <arg name='pBits' declared_type='NSInteger' type='i' type64='q' index='10'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bytesPerRow:bitsPerPixel:'>
-      <arg name='planes' declared_type='unsigned char**' type='^*' index='0'/>
-      <arg name='width' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='height' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='bps' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <arg name='spp' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <arg name='alpha' declared_type='BOOL' type='B' index='5'/>
-      <arg name='isPlanar' declared_type='BOOL' type='B' index='6'/>
-      <arg name='colorSpaceName' declared_type='NSString*' type='@' index='7'/>
-      <arg name='rBytes' declared_type='NSInteger' type='i' type64='q' index='8'/>
-      <arg name='pBits' declared_type='NSInteger' type='i' type64='q' index='9'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithCGImage:'>
-      <arg name='cgImage' declared_type='CGImageRef' type='^{CGImage=}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithCIImage:'>
-      <arg name='ciImage' declared_type='CIImage*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithFocusedViewRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isPlanar'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='localizedNameForTIFFCompressionType:'>
-      <arg name='compression' declared_type='NSTIFFCompression' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='numberOfPlanes'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='representationOfImageRepsInArray:usingType:properties:'>
-      <arg name='imageReps' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='storageType' declared_type='NSBitmapImageFileType' type='I' type64='Q' index='1'/>
-      <arg name='properties' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='representationUsingType:properties:'>
-      <arg name='storageType' declared_type='NSBitmapImageFileType' type='I' type64='Q' index='0'/>
-      <arg name='properties' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='samplesPerPixel'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setColor:atX:y:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <arg name='x' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='y' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCompression:factor:'>
-      <arg name='compression' declared_type='NSTIFFCompression' type='I' type64='Q' index='0'/>
-      <arg name='factor' declared_type='float' type='f' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPixel:atX:y:'>
-      <arg name='p' declared_type='NSUInteger*' type='^I' type64='^Q' index='0'/>
-      <arg name='x' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='y' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setProperty:withValue:'>
-      <arg name='property' declared_type='NSString*' type='@' index='0'/>
-      <arg name='value' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='valueForProperty:'>
-      <arg name='property' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSBox'>
-    <method selector='borderColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='borderRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='borderType'>
-      <retval declared_type='NSBorderType' type='I' type64='Q'/>
-    </method>
-    <method selector='borderWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='boxType'>
-      <retval declared_type='NSBoxType' type='I' type64='Q'/>
-    </method>
-    <method selector='contentView'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='contentViewMargins'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='cornerRadius'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='fillColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='isTransparent'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setBorderColor:'>
-      <arg name='borderColor' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderType:'>
-      <arg name='aType' declared_type='NSBorderType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderWidth:'>
-      <arg name='borderWidth' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBoxType:'>
-      <arg name='boxType' declared_type='NSBoxType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentView:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentViewMargins:'>
-      <arg name='offsetSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCornerRadius:'>
-      <arg name='cornerRadius' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFillColor:'>
-      <arg name='fillColor' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrameFromContentFrame:'>
-      <arg name='contentFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitlePosition:'>
-      <arg name='aPosition' declared_type='NSTitlePosition' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleWithMnemonic:'>
-      <arg name='stringWithAmpersand' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTransparent:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sizeToFit'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='titleCell'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='titleFont'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='titlePosition'>
-      <retval declared_type='NSTitlePosition' type='I' type64='Q'/>
-    </method>
-    <method selector='titleRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-  </class>
-  <class name='NSBrowser'>
-    <method selector='acceptsArrowKeys'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='addColumn'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='allowsBranchSelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsEmptySelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsMultipleSelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsTypeSelect'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='canDragRowsWithIndexes:inColumn:withEvent:'>
-      <arg name='rowIndexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='cellClass'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='cellPrototype'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='columnContentWidthForColumnWidth:'>
-      <arg name='columnWidth' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='columnOfMatrix:'>
-      <arg name='matrix' declared_type='NSMatrix*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='columnResizingType'>
-      <retval declared_type='NSBrowserColumnResizingType' type='I' type64='Q'/>
-    </method>
-    <method selector='columnWidthForColumnContentWidth:'>
-      <arg name='columnContentWidth' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='columnsAutosaveName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='displayAllColumns'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='displayColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='doClick:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='doDoubleClick:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='doubleAction'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='draggingImageForRowsWithIndexes:inColumn:withEvent:offset:'>
-      <arg name='rowIndexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='2'/>
-      <arg name='dragImageOffset' declared_type='NSPointPointer' type='^{_NSPoint=ff}' type64='^{CGPoint=dd}' index='3'/>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='drawTitleOfColumn:inRect:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='firstVisibleColumn'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='frameOfColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='frameOfInsideOfColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='hasHorizontalScroller'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isLoaded'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isTitled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='lastColumn'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='lastVisibleColumn'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='loadColumnZero'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='loadedCellAtRow:column:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='matrixClass'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='matrixInColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSMatrix*' type='@'/>
-    </method>
-    <method selector='maxVisibleColumns'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='minColumnWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='numberOfVisibleColumns'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='path'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pathSeparator'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pathToColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='prefersAllColumnUserResizing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='reloadColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='removeSavedColumnsWithAutosaveName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='reusesColumns'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scrollColumnToVisible:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollColumnsLeftBy:'>
-      <arg name='shiftAmount' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollColumnsRightBy:'>
-      <arg name='shiftAmount' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollViaScroller:'>
-      <arg name='sender' declared_type='NSScroller*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectAll:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectRow:inColumn:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectRowIndexes:inColumn:'>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedCell'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='selectedCellInColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='selectedCells'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='selectedColumn'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='selectedRowInColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='selectedRowIndexesInColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSIndexSet*' type='@'/>
-    </method>
-    <method selector='sendAction'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='sendsActionOnArrowKeys'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='separatesColumns'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAcceptsArrowKeys:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsBranchSelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsEmptySelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsMultipleSelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsTypeSelect:'>
-      <arg name='value' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCellClass:'>
-      <arg name='factoryId' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCellPrototype:'>
-      <arg name='aCell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setColumnResizingType:'>
-      <arg name='columnResizingType' declared_type='NSBrowserColumnResizingType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setColumnsAutosaveName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDoubleAction:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDraggingSourceOperationMask:forLocal:'>
-      <arg name='mask' declared_type='NSDragOperation' type='I' type64='Q' index='0'/>
-      <arg name='isLocal' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHasHorizontalScroller:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLastColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMatrixClass:'>
-      <arg name='factoryId' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxVisibleColumns:'>
-      <arg name='columnCount' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinColumnWidth:'>
-      <arg name='columnWidth' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setPathSeparator:'>
-      <arg name='newString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPrefersAllColumnUserResizing:'>
-      <arg name='prefersAllColumnResizing' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setReusesColumns:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSendsActionOnArrowKeys:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSeparatesColumns:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTakesTitleFromPreviousColumn:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:ofColumn:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWidth:ofColumn:'>
-      <arg name='columnWidth' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='columnIndex' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takesTitleFromPreviousColumn'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tile'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='titleFrameOfColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='titleHeight'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='titleOfColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='updateScroller'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='validateVisibleColumns'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='widthOfColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-  </class>
-  <class name='NSBrowserCell'>
-    <method selector='alternateImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method class_method='true' selector='branchImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='highlightColorInView:'>
-      <arg name='controlView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='highlightedBranchImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='isLeaf'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isLoaded'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='reset'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='set'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlternateImage:'>
-      <arg name='newAltImage' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLeaf:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLoaded:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSBundle'>
-    <method selector='contextHelpForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method class_method='true' selector='loadNibFile:externalNameTable:withZone:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='context' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' index='2' type_modifier='n'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='loadNibFile:externalNameTable:withZone:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='context' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='loadNibNamed:owner:'>
-      <arg name='nibName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='owner' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='pathForImageResource:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pathForSoundResource:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSButton'>
-    <method selector='allowsMixedState'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='alternateImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='alternateTitle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='attributedAlternateTitle'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='attributedTitle'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='bezelStyle'>
-      <retval declared_type='NSBezelStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='getPeriodicDelay:interval:'>
-      <arg name='delay' declared_type='float*' type='^f' index='0'/>
-      <arg name='interval' declared_type='float*' type='^f' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='highlight:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='imagePosition'>
-      <retval declared_type='NSCellImagePosition' type='I' type64='Q'/>
-    </method>
-    <method selector='isBordered'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isTransparent'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keyEquivalent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='keyEquivalentModifierMask'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='performKeyEquivalent:'>
-      <arg name='key' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAllowsMixedState:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlternateImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlternateTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedAlternateTitle:'>
-      <arg name='obj' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedTitle:'>
-      <arg name='aString' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBezelStyle:'>
-      <arg name='bezelStyle' declared_type='NSBezelStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBordered:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setButtonType:'>
-      <arg name='aType' declared_type='NSButtonType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImagePosition:'>
-      <arg name='aPosition' declared_type='NSCellImagePosition' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKeyEquivalent:'>
-      <arg name='charCode' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKeyEquivalentModifierMask:'>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNextState'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPeriodicDelay:interval:'>
-      <arg name='delay' declared_type='float' type='f' index='0'/>
-      <arg name='interval' declared_type='float' type='f' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsBorderOnlyWhileMouseInside:'>
-      <arg name='show' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSound:'>
-      <arg name='aSound' declared_type='NSSound*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setState:'>
-      <arg name='value' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleWithMnemonic:'>
-      <arg name='stringWithAmpersand' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTransparent:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showsBorderOnlyWhileMouseInside'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='sound'>
-      <retval declared_type='NSSound*' type='@'/>
-    </method>
-    <method selector='state'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSButtonCell'>
-    <method selector='alternateImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='alternateMnemonic'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='alternateMnemonicLocation'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='alternateTitle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='attributedAlternateTitle'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='attributedTitle'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='bezelStyle'>
-      <retval declared_type='NSBezelStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='drawBezelWithFrame:inView:'>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawImage:withFrame:inView:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawTitle:withFrame:inView:'>
-      <arg name='title' declared_type='NSAttributedString*' type='@' index='0'/>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='getPeriodicDelay:interval:'>
-      <arg name='delay' declared_type='float*' type='^f' index='0'/>
-      <arg name='interval' declared_type='float*' type='^f' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='gradientType'>
-      <retval declared_type='NSGradientType' type='I' type64='Q'/>
-    </method>
-    <method selector='highlightsBy'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='imageDimsWhenDisabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='imagePosition'>
-      <retval declared_type='NSCellImagePosition' type='I' type64='Q'/>
-    </method>
-    <method selector='imageScaling'>
-      <retval declared_type='NSImageScaling' type='I' type64='Q'/>
-    </method>
-    <method selector='isOpaque'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isTransparent'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keyEquivalent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='keyEquivalentFont'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='keyEquivalentModifierMask'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='mouseEntered:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='mouseExited:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performClick:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlternateImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlternateMnemonicLocation:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlternateTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlternateTitleWithMnemonic:'>
-      <arg name='stringWithAmpersand' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedAlternateTitle:'>
-      <arg name='obj' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedTitle:'>
-      <arg name='obj' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBezelStyle:'>
-      <arg name='bezelStyle' declared_type='NSBezelStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setButtonType:'>
-      <arg name='aType' declared_type='NSButtonType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGradientType:'>
-      <arg name='type' declared_type='NSGradientType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHighlightsBy:'>
-      <arg name='aType' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImageDimsWhenDisabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImagePosition:'>
-      <arg name='aPosition' declared_type='NSCellImagePosition' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImageScaling:'>
-      <arg name='scaling' declared_type='NSImageScaling' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKeyEquivalent:'>
-      <arg name='aKeyEquivalent' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKeyEquivalentFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKeyEquivalentFont:size:'>
-      <arg name='fontName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKeyEquivalentModifierMask:'>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPeriodicDelay:interval:'>
-      <arg name='delay' declared_type='float' type='f' index='0'/>
-      <arg name='interval' declared_type='float' type='f' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsBorderOnlyWhileMouseInside:'>
-      <arg name='show' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsStateBy:'>
-      <arg name='aType' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSound:'>
-      <arg name='aSound' declared_type='NSSound*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleWithMnemonic:'>
-      <arg name='stringWithAmpersand' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTransparent:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showsBorderOnlyWhileMouseInside'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='showsStateBy'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='sound'>
-      <retval declared_type='NSSound*' type='@'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSCIImageRep'>
-    <method selector='CIImage'>
-      <retval declared_type='CIImage*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageRepWithCIImage:'>
-      <arg name='image' declared_type='CIImage*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithCIImage:'>
-      <arg name='image' declared_type='CIImage*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSCachedImageRep'>
-    <method selector='initWithSize:depth:separate:alpha:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <arg name='depth' declared_type='NSWindowDepth' type='i' index='1'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='2'/>
-      <arg name='alpha' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithWindow:rect:'>
-      <arg name='win' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='rect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='window'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-  </class>
-  <class name='NSCell'>
-    <method selector='acceptsFirstResponder'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='action'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='alignment'>
-      <retval declared_type='NSTextAlignment' type='I' type64='Q'/>
-    </method>
-    <method selector='allowsEditingTextAttributes'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsMixedState'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsUndo'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='attributedStringValue'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='backgroundStyle'>
-      <retval declared_type='NSBackgroundStyle' type='i' type64='q'/>
-    </method>
-    <method selector='baseWritingDirection'>
-      <retval declared_type='NSWritingDirection' type='i' type64='q'/>
-    </method>
-    <method selector='calcDrawInfo:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='cellAttribute:'>
-      <arg name='aParameter' declared_type='NSCellAttribute' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='cellSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='cellSizeForBounds:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='compare:'>
-      <arg name='otherCell' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method selector='continueTracking:at:inView:'>
-      <arg name='lastPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='currentPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='controlSize'>
-      <retval declared_type='NSControlSize' type='I' type64='Q'/>
-    </method>
-    <method selector='controlTint'>
-      <retval declared_type='NSControlTint' type='I' type64='Q'/>
-    </method>
-    <method selector='controlView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method class_method='true' selector='defaultFocusRingType'>
-      <retval declared_type='NSFocusRingType' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='defaultMenu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='doubleValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='drawInteriorWithFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawWithExpansionFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='view' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawWithFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawingRectForBounds:'>
-      <arg name='theRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='editWithFrame:inView:editor:delegate:event:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <arg name='textObj' declared_type='NSText*' type='@' index='2'/>
-      <arg name='anObject' declared_type='id' type='@' index='3'/>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='endEditing:'>
-      <arg name='textObj' declared_type='NSText*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='entryType'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='expansionFrameWithFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='view' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='floatValue'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='focusRingType'>
-      <retval declared_type='NSFocusRingType' type='I' type64='Q'/>
-    </method>
-    <method selector='font'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='formatter'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='getPeriodicDelay:interval:'>
-      <arg name='delay' declared_type='float*' type='^f' index='0'/>
-      <arg name='interval' declared_type='float*' type='^f' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='hasValidObjectValue'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='highlight:withFrame:inView:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='highlightColorWithFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='hitTestForEvent:inRect:ofView:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='imageRectForBounds:'>
-      <arg name='theRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='importsGraphics'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initImageCell:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initTextCell:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='intValue'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='integerValue'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='interiorBackgroundStyle'>
-      <retval declared_type='NSBackgroundStyle' type='i' type64='q'/>
-    </method>
-    <method selector='isBezeled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isBordered'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isContinuous'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEditable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEntryAcceptable:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isHighlighted'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isOpaque'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isScrollable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSelectable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keyEquivalent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='lineBreakMode'>
-      <retval declared_type='NSLineBreakMode' type='I' type64='Q'/>
-    </method>
-    <method selector='menu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='menuForEvent:inRect:ofView:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='view' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='mnemonic'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='mnemonicLocation'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='mouseDownFlags'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='nextState'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='objectValue'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='performClick:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='prefersTrackingUntilMouseUp'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='refusesFirstResponder'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='representedObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='resetCursorRect:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectWithFrame:inView:editor:delegate:start:length:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <arg name='textObj' declared_type='NSText*' type='@' index='2'/>
-      <arg name='anObject' declared_type='id' type='@' index='3'/>
-      <arg name='selStart' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <arg name='selLength' declared_type='NSInteger' type='i' type64='q' index='5'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sendActionOn:'>
-      <arg name='mask' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='sendsActionOnEndEditing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAction:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlignment:'>
-      <arg name='mode' declared_type='NSTextAlignment' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsEditingTextAttributes:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsMixedState:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsUndo:'>
-      <arg name='allowsUndo' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedStringValue:'>
-      <arg name='obj' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundStyle:'>
-      <arg name='style' declared_type='NSBackgroundStyle' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBaseWritingDirection:'>
-      <arg name='writingDirection' declared_type='NSWritingDirection' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBezeled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBordered:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCellAttribute:to:'>
-      <arg name='aParameter' declared_type='NSCellAttribute' type='I' type64='Q' index='0'/>
-      <arg name='value' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContinuous:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setControlSize:'>
-      <arg name='size' declared_type='NSControlSize' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setControlTint:'>
-      <arg name='controlTint' declared_type='NSControlTint' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setControlView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDoubleValue:'>
-      <arg name='aDouble' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEditable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEntryType:'>
-      <arg name='aType' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFloatValue:'>
-      <arg name='aFloat' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFloatingPointFormat:left:right:'>
-      <arg name='autoRange' declared_type='BOOL' type='B' index='0'/>
-      <arg name='leftDigits' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='rightDigits' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFocusRingType:'>
-      <arg name='focusRingType' declared_type='NSFocusRingType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFormatter:'>
-      <arg name='newFormatter' declared_type='NSFormatter*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHighlighted:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImportsGraphics:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIntValue:'>
-      <arg name='anInt' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIntegerValue:'>
-      <arg name='anInteger' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineBreakMode:'>
-      <arg name='mode' declared_type='NSLineBreakMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenu:'>
-      <arg name='aMenu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMnemonicLocation:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNextState'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObjectValue:'>
-      <arg name='obj' declared_type='id &lt;NSCopying&gt;' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRefusesFirstResponder:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRepresentedObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setScrollable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSendsActionOnEndEditing:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsFirstResponder:'>
-      <arg name='showFR' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setState:'>
-      <arg name='value' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStringValue:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTag:'>
-      <arg name='anInt' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTarget:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleWithMnemonic:'>
-      <arg name='stringWithAmpersand' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTruncatesLastVisibleLine:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setType:'>
-      <arg name='aType' declared_type='NSCellType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUpFieldEditorAttributes:'>
-      <arg name='textObj' declared_type='NSText*' type='@' index='0'/>
-      <retval declared_type='NSText*' type='@'/>
-    </method>
-    <method selector='setWraps:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showsFirstResponder'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='startTrackingAt:inView:'>
-      <arg name='startPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='state'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='stopTracking:at:inView:mouseIsUp:'>
-      <arg name='lastPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='stopPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stringValue'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='tag'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='takeDoubleValueFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeFloatValueFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeIntValueFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeIntegerValueFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeObjectValueFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeStringValueFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='target'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='titleRectForBounds:'>
-      <arg name='theRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='trackMouse:inRect:ofView:untilMouseUp:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='truncatesLastVisibleLine'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='type'>
-      <retval declared_type='NSCellType' type='I' type64='Q'/>
-    </method>
-    <method selector='wantsNotificationForMarkedText'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='wraps'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSClipView'>
-    <method selector='autoscroll:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='constrainScrollPoint:'>
-      <arg name='newOrigin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='copiesOnScroll'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='documentCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method selector='documentRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='documentView'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='documentVisibleRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='drawsBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scrollToPoint:'>
-      <arg name='newOrigin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCopiesOnScroll:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDocumentCursor:'>
-      <arg name='anObj' declared_type='NSCursor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDocumentView:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsBackground:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewBoundsChanged:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewFrameChanged:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSCoder'>
-    <method selector='decodeNXColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-  </class>
-  <class name='NSCollectionView'>
-    <method selector='allowsMultipleSelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='backgroundColors'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='content'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='isFirstResponder'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSelectable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='itemPrototype'>
-      <retval declared_type='NSCollectionViewItem*' type='@'/>
-    </method>
-    <method selector='maxItemSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='maxNumberOfColumns'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='maxNumberOfRows'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='minItemSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='newItemForRepresentedObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSCollectionViewItem*' type='@'/>
-    </method>
-    <method selector='selectionIndexes'>
-      <retval declared_type='NSIndexSet*' type='@'/>
-    </method>
-    <method selector='setAllowsMultipleSelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColors:'>
-      <arg name='colors' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContent:'>
-      <arg name='content' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setItemPrototype:'>
-      <arg name='prototype' declared_type='NSCollectionViewItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxItemSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxNumberOfColumns:'>
-      <arg name='number' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxNumberOfRows:'>
-      <arg name='number' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinItemSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectionIndexes:'>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSCollectionViewItem'>
-    <method selector='collectionView'>
-      <retval declared_type='NSCollectionView*' type='@'/>
-    </method>
-    <method selector='isSelected'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='representedObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setRepresentedObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelected:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='view'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-  </class>
-  <class name='NSColor'>
-    <method selector='alphaComponent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='alternateSelectedControlColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='alternateSelectedControlTextColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='blackColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='blackComponent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='blendedColorWithFraction:ofColor:'>
-      <arg name='fraction' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='color' declared_type='NSColor*' type='@' index='1'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='blueColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='blueComponent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='brightnessComponent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='brownColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='catalogNameComponent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='clearColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorForControlTint:'>
-      <arg name='controlTint' declared_type='NSControlTint' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorFromPasteboard:'>
-      <arg name='pasteBoard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='colorNameComponent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='colorSpace'>
-      <retval declared_type='NSColorSpace*' type='@'/>
-    </method>
-    <method selector='colorSpaceName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='colorUsingColorSpace:'>
-      <arg name='space' declared_type='NSColorSpace*' type='@' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='colorUsingColorSpaceName:'>
-      <arg name='colorSpace' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='colorUsingColorSpaceName:device:'>
-      <arg name='colorSpace' declared_type='NSString*' type='@' index='0'/>
-      <arg name='deviceDescription' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='colorWithAlphaComponent:'>
-      <arg name='alpha' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorWithCIColor:'>
-      <arg name='color' declared_type='CIColor*' type='@' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorWithCalibratedHue:saturation:brightness:alpha:'>
-      <arg name='hue' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='saturation' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='brightness' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <arg name='alpha' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorWithCalibratedRed:green:blue:alpha:'>
-      <arg name='red' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='green' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='blue' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <arg name='alpha' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorWithCalibratedWhite:alpha:'>
-      <arg name='white' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='alpha' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorWithCatalogName:colorName:'>
-      <arg name='listName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='colorName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorWithColorSpace:components:count:'>
-      <arg name='space' declared_type='NSColorSpace*' type='@' index='0'/>
-      <arg name='components' declared_type='CGFloat*' type='^f' type64='^d' const='true' index='1'/>
-      <arg name='numberOfComponents' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorWithDeviceCyan:magenta:yellow:black:alpha:'>
-      <arg name='cyan' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='magenta' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='yellow' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <arg name='black' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <arg name='alpha' declared_type='CGFloat' type='f' type64='d' index='4'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorWithDeviceHue:saturation:brightness:alpha:'>
-      <arg name='hue' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='saturation' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='brightness' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <arg name='alpha' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorWithDeviceRed:green:blue:alpha:'>
-      <arg name='red' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='green' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='blue' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <arg name='alpha' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorWithDeviceWhite:alpha:'>
-      <arg name='white' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='alpha' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorWithPatternImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='controlAlternatingRowBackgroundColors'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='controlBackgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='controlColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='controlDarkShadowColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='controlHighlightColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='controlLightHighlightColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='controlShadowColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='controlTextColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='currentControlTint'>
-      <retval declared_type='NSControlTint' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='cyanColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='cyanComponent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='darkGrayColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='disabledControlTextColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='drawSwatchInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getComponents:'>
-      <arg name='components' declared_type='CGFloat*' type='^f' type64='^d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getCyan:magenta:yellow:black:alpha:'>
-      <arg name='cyan' declared_type='CGFloat*' type='^f' type64='^d' index='0'/>
-      <arg name='magenta' declared_type='CGFloat*' type='^f' type64='^d' index='1'/>
-      <arg name='yellow' declared_type='CGFloat*' type='^f' type64='^d' index='2'/>
-      <arg name='black' declared_type='CGFloat*' type='^f' type64='^d' index='3'/>
-      <arg name='alpha' declared_type='CGFloat*' type='^f' type64='^d' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getHue:saturation:brightness:alpha:'>
-      <arg name='hue' declared_type='CGFloat*' type='^f' type64='^d' index='0'/>
-      <arg name='saturation' declared_type='CGFloat*' type='^f' type64='^d' index='1'/>
-      <arg name='brightness' declared_type='CGFloat*' type='^f' type64='^d' index='2'/>
-      <arg name='alpha' declared_type='CGFloat*' type='^f' type64='^d' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getRed:green:blue:alpha:'>
-      <arg name='red' declared_type='CGFloat*' type='^f' type64='^d' index='0'/>
-      <arg name='green' declared_type='CGFloat*' type='^f' type64='^d' index='1'/>
-      <arg name='blue' declared_type='CGFloat*' type='^f' type64='^d' index='2'/>
-      <arg name='alpha' declared_type='CGFloat*' type='^f' type64='^d' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getWhite:alpha:'>
-      <arg name='white' declared_type='CGFloat*' type='^f' type64='^d' index='0'/>
-      <arg name='alpha' declared_type='CGFloat*' type='^f' type64='^d' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='grayColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='greenColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='greenComponent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='gridColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='headerColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='headerTextColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='highlightColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='highlightWithLevel:'>
-      <arg name='val' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='hueComponent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='ignoresAlpha'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='keyboardFocusIndicatorColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='knobColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='lightGrayColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='localizedCatalogNameComponent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='localizedColorNameComponent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='magentaColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='magentaComponent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='numberOfComponents'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='orangeColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='patternImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method class_method='true' selector='purpleColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='redColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='redComponent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='saturationComponent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='scrollBarColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='secondarySelectedControlColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='selectedControlColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='selectedControlTextColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='selectedKnobColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='selectedMenuItemColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='selectedMenuItemTextColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='selectedTextBackgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='selectedTextColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='set'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFill'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setIgnoresAlpha:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStroke'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='shadowColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='shadowWithLevel:'>
-      <arg name='val' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='textBackgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='textColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='whiteColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='whiteComponent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='windowBackgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='windowFrameColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method class_method='true' selector='windowFrameTextColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='writeToPasteboard:'>
-      <arg name='pasteBoard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='yellowColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='yellowComponent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-  </class>
-  <class name='NSColorList'>
-    <method selector='allKeys'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='availableColorLists'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='colorListNamed:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSColorList*' type='@'/>
-    </method>
-    <method selector='colorWithKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='initWithName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithName:fromFile:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='path' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertColor:key:atIndex:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <arg name='loc' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isEditable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='removeColorWithKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeFile'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setColor:forKey:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='writeToFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSColorPanel'>
-    <method selector='accessoryView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='alpha'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='attachColorList:'>
-      <arg name='colorList' declared_type='NSColorList*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='color'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='detachColorList:'>
-      <arg name='colorList' declared_type='NSColorList*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='dragColor:withEvent:fromView:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='1'/>
-      <arg name='sourceView' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isContinuous'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='mode'>
-      <retval declared_type='NSColorPanelMode' type='i' type64='q'/>
-    </method>
-    <method selector='setAccessoryView:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAction:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContinuous:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMode:'>
-      <arg name='mode' declared_type='NSColorPanelMode' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setPickerMask:'>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setPickerMode:'>
-      <arg name='mode' declared_type='NSColorPanelMode' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsAlpha:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTarget:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedColorPanel'>
-      <retval declared_type='NSColorPanel*' type='@'/>
-    </method>
-    <method class_method='true' selector='sharedColorPanelExists'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='showsAlpha'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSColorPicker'>
-    <method selector='attachColorList:'>
-      <arg name='colorList' declared_type='NSColorList*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='buttonToolTip'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='colorPanel'>
-      <retval declared_type='NSColorPanel*' type='@'/>
-    </method>
-    <method selector='detachColorList:'>
-      <arg name='colorList' declared_type='NSColorList*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithPickerMask:colorPanel:'>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='owningColorPanel' declared_type='NSColorPanel*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertNewButtonImage:in:'>
-      <arg name='newButtonImage' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='buttonCell' declared_type='NSButtonCell*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='minContentSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='provideNewButtonImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='setMode:'>
-      <arg name='mode' declared_type='NSColorPanelMode' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewSizeChanged:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSColorSpace'>
-    <method selector='CGColorSpace'>
-      <retval declared_type='CGColorSpaceRef' type='^{CGColorSpace=}'/>
-    </method>
-    <method selector='ICCProfileData'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method class_method='true' selector='adobeRGB1998ColorSpace'>
-      <retval declared_type='NSColorSpace*' type='@'/>
-    </method>
-    <method selector='colorSpaceModel'>
-      <retval declared_type='NSColorSpaceModel' type='i' type64='q'/>
-    </method>
-    <method selector='colorSyncProfile'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method class_method='true' selector='deviceCMYKColorSpace'>
-      <retval declared_type='NSColorSpace*' type='@'/>
-    </method>
-    <method class_method='true' selector='deviceGrayColorSpace'>
-      <retval declared_type='NSColorSpace*' type='@'/>
-    </method>
-    <method class_method='true' selector='deviceRGBColorSpace'>
-      <retval declared_type='NSColorSpace*' type='@'/>
-    </method>
-    <method class_method='true' selector='genericCMYKColorSpace'>
-      <retval declared_type='NSColorSpace*' type='@'/>
-    </method>
-    <method class_method='true' selector='genericGrayColorSpace'>
-      <retval declared_type='NSColorSpace*' type='@'/>
-    </method>
-    <method class_method='true' selector='genericRGBColorSpace'>
-      <retval declared_type='NSColorSpace*' type='@'/>
-    </method>
-    <method selector='initWithCGColorSpace:'>
-      <arg name='cgColorSpace' declared_type='CGColorSpaceRef' type='^{CGColorSpace=}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithColorSyncProfile:'>
-      <arg name='prof' declared_type='void*' type='^v' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithICCProfileData:'>
-      <arg name='iccData' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='localizedName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='numberOfColorComponents'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='sRGBColorSpace'>
-      <retval declared_type='NSColorSpace*' type='@'/>
-    </method>
-  </class>
-  <class name='NSColorWell'>
-    <method selector='activate:'>
-      <arg name='exclusive' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='color'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='deactivate'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawWellInside:'>
-      <arg name='insideRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isActive'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isBordered'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setBordered:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeColorFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSComboBox'>
-    <method selector='addItemWithObjectValue:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addItemsWithObjectValues:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='completes'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='dataSource'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='deselectItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='hasVerticalScroller'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='indexOfItemWithObjectValue:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfSelectedItem'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='insertItemWithObjectValue:atIndex:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='intercellSpacing'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='isButtonBordered'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='itemHeight'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='itemObjectValueAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='noteNumberOfItemsChanged'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='numberOfItems'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='numberOfVisibleItems'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='objectValueOfSelectedItem'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectValues'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='reloadData'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAllItems'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeItemWithObjectValue:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollItemAtIndexToTop:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollItemAtIndexToVisible:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectItemWithObjectValue:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setButtonBordered:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCompletes:'>
-      <arg name='completes' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDataSource:'>
-      <arg name='aSource' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHasVerticalScroller:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIntercellSpacing:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setItemHeight:'>
-      <arg name='itemHeight' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNumberOfVisibleItems:'>
-      <arg name='visibleItems' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesDataSource:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='usesDataSource'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSComboBoxCell'>
-    <method selector='addItemWithObjectValue:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addItemsWithObjectValues:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='completedString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='completes'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='dataSource'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='deselectItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='hasVerticalScroller'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='indexOfItemWithObjectValue:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfSelectedItem'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='insertItemWithObjectValue:atIndex:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='intercellSpacing'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='isButtonBordered'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='itemHeight'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='itemObjectValueAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='noteNumberOfItemsChanged'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='numberOfItems'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='numberOfVisibleItems'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='objectValueOfSelectedItem'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectValues'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='reloadData'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAllItems'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeItemWithObjectValue:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollItemAtIndexToTop:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollItemAtIndexToVisible:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectItemWithObjectValue:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setButtonBordered:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCompletes:'>
-      <arg name='completes' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDataSource:'>
-      <arg name='aSource' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHasVerticalScroller:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIntercellSpacing:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setItemHeight:'>
-      <arg name='itemHeight' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNumberOfVisibleItems:'>
-      <arg name='visibleItems' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesDataSource:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='usesDataSource'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSControl'>
-    <method selector='abortEditing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='action'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='alignment'>
-      <retval declared_type='NSTextAlignment' type='I' type64='Q'/>
-    </method>
-    <method selector='attributedStringValue'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='baseWritingDirection'>
-      <retval declared_type='NSWritingDirection' type='i' type64='q'/>
-    </method>
-    <method selector='calcSize'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='cell'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='cellClass'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='currentEditor'>
-      <retval declared_type='NSText*' type='@'/>
-    </method>
-    <method selector='doubleValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='drawCell:'>
-      <arg name='aCell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawCellInside:'>
-      <arg name='aCell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='floatValue'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='font'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='formatter'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='ignoresMultiClick'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initWithFrame:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='intValue'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='integerValue'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='isContinuous'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='mouseDown:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='objectValue'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='performClick:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='refusesFirstResponder'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectCell:'>
-      <arg name='aCell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedCell'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='selectedTag'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='sendAction:to:'>
-      <arg name='theAction' declared_type='SEL' type=':' index='0'/>
-      <arg name='theTarget' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='sendActionOn:'>
-      <arg name='mask' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setAction:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlignment:'>
-      <arg name='mode' declared_type='NSTextAlignment' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedStringValue:'>
-      <arg name='obj' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBaseWritingDirection:'>
-      <arg name='writingDirection' declared_type='NSWritingDirection' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCell:'>
-      <arg name='aCell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setCellClass:'>
-      <arg name='factoryId' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContinuous:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDoubleValue:'>
-      <arg name='aDouble' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFloatValue:'>
-      <arg name='aFloat' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFloatingPointFormat:left:right:'>
-      <arg name='autoRange' declared_type='BOOL' type='B' index='0'/>
-      <arg name='leftDigits' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='rightDigits' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFormatter:'>
-      <arg name='newFormatter' declared_type='NSFormatter*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIgnoresMultiClick:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIntValue:'>
-      <arg name='anInt' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIntegerValue:'>
-      <arg name='anInteger' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNeedsDisplay'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObjectValue:'>
-      <arg name='obj' declared_type='id&lt;NSCopying&gt;' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRefusesFirstResponder:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStringValue:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTag:'>
-      <arg name='anInt' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTarget:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sizeToFit'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stringValue'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='tag'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='takeDoubleValueFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeFloatValueFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeIntValueFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeIntegerValueFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeObjectValueFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeStringValueFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='target'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='updateCell:'>
-      <arg name='aCell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='updateCellInside:'>
-      <arg name='aCell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='validateEditing'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSController'>
-    <method selector='commitEditing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='commitEditingWithDelegate:didCommitSelector:contextInfo:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <arg name='didCommitSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='discardEditing'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isEditing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='objectDidBeginEditing:'>
-      <arg name='editor' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='objectDidEndEditing:'>
-      <arg name='editor' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSCursor'>
-    <method class_method='true' selector='IBeamCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method class_method='true' selector='arrowCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method class_method='true' selector='closedHandCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method class_method='true' selector='crosshairCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method class_method='true' selector='currentCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method class_method='true' selector='disappearingItemCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method class_method='true' selector='hide'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='hotSpot'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='initWithImage:foregroundColorHint:backgroundColorHint:hotSpot:'>
-      <arg name='newImage' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='fg' declared_type='NSColor*' type='@' index='1'/>
-      <arg name='bg' declared_type='NSColor*' type='@' index='2'/>
-      <arg name='hotSpot' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithImage:hotSpot:'>
-      <arg name='newImage' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isSetOnMouseEntered'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSetOnMouseExited'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='mouseEntered:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='mouseExited:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='openHandCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method class_method='true' selector='pointingHandCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method selector='pop'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='pop'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='push'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='resizeDownCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method class_method='true' selector='resizeLeftCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method class_method='true' selector='resizeLeftRightCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method class_method='true' selector='resizeRightCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method class_method='true' selector='resizeUpCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method class_method='true' selector='resizeUpDownCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method selector='set'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setHiddenUntilMouseMoves:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOnMouseEntered:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOnMouseExited:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='unhide'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSCustomImageRep'>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='drawSelector'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='initWithDrawSelector:delegate:'>
-      <arg name='aMethod' declared_type='SEL' type=':' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSDatePicker'>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='calendar'>
-      <retval declared_type='NSCalendar*' type='@'/>
-    </method>
-    <method selector='datePickerElements'>
-      <retval declared_type='NSDatePickerElementFlags' type='I' type64='Q'/>
-    </method>
-    <method selector='datePickerMode'>
-      <retval declared_type='NSDatePickerMode' type='I' type64='Q'/>
-    </method>
-    <method selector='datePickerStyle'>
-      <retval declared_type='NSDatePickerStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='dateValue'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='drawsBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isBezeled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isBordered'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='locale'>
-      <retval declared_type='NSLocale*' type='@'/>
-    </method>
-    <method selector='maxDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='minDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBezeled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBordered:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCalendar:'>
-      <arg name='newCalendar' declared_type='NSCalendar*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDatePickerElements:'>
-      <arg name='elementFlags' declared_type='NSDatePickerElementFlags' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDatePickerMode:'>
-      <arg name='newMode' declared_type='NSDatePickerMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDatePickerStyle:'>
-      <arg name='newStyle' declared_type='NSDatePickerStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDateValue:'>
-      <arg name='newStartDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsBackground:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocale:'>
-      <arg name='newLocale' declared_type='NSLocale*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxDate:'>
-      <arg name='date' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinDate:'>
-      <arg name='date' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTimeInterval:'>
-      <arg name='newTimeInterval' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTimeZone:'>
-      <arg name='newTimeZone' declared_type='NSTimeZone*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='timeInterval'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='timeZone'>
-      <retval declared_type='NSTimeZone*' type='@'/>
-    </method>
-  </class>
-  <class name='NSDatePickerCell'>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='calendar'>
-      <retval declared_type='NSCalendar*' type='@'/>
-    </method>
-    <method selector='datePickerElements'>
-      <retval declared_type='NSDatePickerElementFlags' type='I' type64='Q'/>
-    </method>
-    <method selector='datePickerMode'>
-      <retval declared_type='NSDatePickerMode' type='I' type64='Q'/>
-    </method>
-    <method selector='datePickerStyle'>
-      <retval declared_type='NSDatePickerStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='dateValue'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='drawsBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='locale'>
-      <retval declared_type='NSLocale*' type='@'/>
-    </method>
-    <method selector='maxDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='minDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCalendar:'>
-      <arg name='newCalendar' declared_type='NSCalendar*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDatePickerElements:'>
-      <arg name='elementFlags' declared_type='NSDatePickerElementFlags' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDatePickerMode:'>
-      <arg name='newMode' declared_type='NSDatePickerMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDatePickerStyle:'>
-      <arg name='newStyle' declared_type='NSDatePickerStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDateValue:'>
-      <arg name='newStartDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsBackground:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocale:'>
-      <arg name='newLocale' declared_type='NSLocale*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxDate:'>
-      <arg name='date' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinDate:'>
-      <arg name='date' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTimeInterval:'>
-      <arg name='newTimeInterval' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTimeZone:'>
-      <arg name='newTimeZone' declared_type='NSTimeZone*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='timeInterval'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='timeZone'>
-      <retval declared_type='NSTimeZone*' type='@'/>
-    </method>
-  </class>
-  <class name='NSDictionaryController'>
-    <method selector='excludedKeys'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='includedKeys'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='initialKey'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='initialValue'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='localizedKeyDictionary'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='localizedKeyTable'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='newObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setExcludedKeys:'>
-      <arg name='keys' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIncludedKeys:'>
-      <arg name='keys' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setInitialKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setInitialValue:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocalizedKeyDictionary:'>
-      <arg name='dictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocalizedKeyTable:'>
-      <arg name='stringsFileName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSDockTile'>
-    <method selector='badgeLabel'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='contentView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='display'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='owner'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setBadgeLabel:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsApplicationBadge:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showsApplicationBadge'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='size'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-  </class>
-  <class name='NSDocument'>
-    <method selector='addWindowController:'>
-      <arg name='windowController' declared_type='NSWindowController*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='autosaveDocumentWithDelegate:didAutosaveSelector:contextInfo:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <arg name='didAutosaveSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='autosavedContentsFileURL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='autosavingFileType'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='canCloseDocumentWithDelegate:shouldCloseSelector:contextInfo:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <arg name='shouldCloseSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='close'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='dataOfType:error:'>
-      <arg name='typeName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='dataRepresentationOfType:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='displayName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fileAttributesToWriteToFile:ofType:saveOperation:'>
-      <arg name='fullDocumentPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='documentTypeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='saveOperationType' declared_type='NSSaveOperationType' type='I' type64='Q' index='2'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='fileAttributesToWriteToURL:ofType:forSaveOperation:originalContentsURL:error:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='saveOperation' declared_type='NSSaveOperationType' type='I' type64='Q' index='2'/>
-      <arg name='absoluteOriginalContentsURL' declared_type='NSURL*' type='@' index='3'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='4'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='fileModificationDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='fileName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fileNameExtensionForType:saveOperation:'>
-      <arg name='typeName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='saveOperation' declared_type='NSSaveOperationType' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fileNameExtensionWasHiddenInLastRunSavePanel'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileType'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fileTypeFromLastRunSavePanel'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fileURL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='fileWrapperOfType:error:'>
-      <arg name='typeName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='NSFileWrapper*' type='@'/>
-    </method>
-    <method selector='fileWrapperRepresentationOfType:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSFileWrapper*' type='@'/>
-    </method>
-    <method selector='handleCloseScriptCommand:'>
-      <arg name='command' declared_type='NSCloseCommand*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='handlePrintScriptCommand:'>
-      <arg name='command' declared_type='NSScriptCommand*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='handleSaveScriptCommand:'>
-      <arg name='command' declared_type='NSScriptCommand*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='hasUnautosavedChanges'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasUndoManager'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initForURL:withContentsOfURL:ofType:error:'>
-      <arg name='absoluteDocumentURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='absoluteDocumentContentsURL' declared_type='NSURL*' type='@' index='1'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='2'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfFile:ofType:'>
-      <arg name='absolutePath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:ofType:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:ofType:error:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithType:error:'>
-      <arg name='typeName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isDocumentEdited'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='isNativeType:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keepBackupFile'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='lastComponentOfFileName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='loadDataRepresentation:ofType:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='loadFileWrapperRepresentation:ofType:'>
-      <arg name='wrapper' declared_type='NSFileWrapper*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='makeWindowControllers'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='objectSpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='preparePageLayout:'>
-      <arg name='pageLayout' declared_type='NSPageLayout*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='prepareSavePanel:'>
-      <arg name='savePanel' declared_type='NSSavePanel*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='presentError:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='presentError:modalForWindow:delegate:didPresentSelector:contextInfo:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <arg name='window' declared_type='NSWindow*' type='@' index='1'/>
-      <arg name='delegate' declared_type='id' type='@' index='2'/>
-      <arg name='didPresentSelector' declared_type='SEL' type=':' index='3'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='printDocument:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='printDocumentWithSettings:showPrintPanel:delegate:didPrintSelector:contextInfo:'>
-      <arg name='printSettings' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='showPrintPanel' declared_type='BOOL' type='B' index='1'/>
-      <arg name='delegate' declared_type='id' type='@' index='2'/>
-      <arg name='didPrintSelector' declared_type='SEL' type=':' index='3'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='printInfo'>
-      <retval declared_type='NSPrintInfo*' type='@'/>
-    </method>
-    <method selector='printOperationWithSettings:error:'>
-      <arg name='printSettings' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='NSPrintOperation*' type='@'/>
-    </method>
-    <method selector='printShowingPrintPanel:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='readFromData:ofType:error:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='readFromFile:ofType:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='readFromFileWrapper:ofType:error:'>
-      <arg name='fileWrapper' declared_type='NSFileWrapper*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='readFromURL:ofType:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='readFromURL:ofType:error:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='readableTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='removeWindowController:'>
-      <arg name='windowController' declared_type='NSWindowController*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='revertDocumentToSaved:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='revertToContentsOfURL:ofType:error:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='revertToSavedFromFile:ofType:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='revertToSavedFromURL:ofType:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='runModalPageLayoutWithPrintInfo:'>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='runModalPageLayoutWithPrintInfo:delegate:didRunSelector:contextInfo:'>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='0'/>
-      <arg name='delegate' declared_type='id' type='@' index='1'/>
-      <arg name='didRunSelector' declared_type='SEL' type=':' index='2'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='runModalPrintOperation:delegate:didRunSelector:contextInfo:'>
-      <arg name='printOperation' declared_type='NSPrintOperation*' type='@' index='0'/>
-      <arg name='delegate' declared_type='id' type='@' index='1'/>
-      <arg name='didRunSelector' declared_type='SEL' type=':' index='2'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='runModalSavePanelForSaveOperation:delegate:didSaveSelector:contextInfo:'>
-      <arg name='saveOperation' declared_type='NSSaveOperationType' type='I' type64='Q' index='0'/>
-      <arg name='delegate' declared_type='id' type='@' index='1'/>
-      <arg name='didSaveSelector' declared_type='SEL' type=':' index='2'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='runPageLayout:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='saveDocument:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='saveDocumentAs:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='saveDocumentTo:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='saveDocumentWithDelegate:didSaveSelector:contextInfo:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <arg name='didSaveSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='saveToFile:saveOperation:delegate:didSaveSelector:contextInfo:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='saveOperation' declared_type='NSSaveOperationType' type='I' type64='Q' index='1'/>
-      <arg name='delegate' declared_type='id' type='@' index='2'/>
-      <arg name='didSaveSelector' declared_type='SEL' type=':' index='3'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='saveToURL:ofType:forSaveOperation:delegate:didSaveSelector:contextInfo:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='saveOperation' declared_type='NSSaveOperationType' type='I' type64='Q' index='2'/>
-      <arg name='delegate' declared_type='id' type='@' index='3'/>
-      <arg name='didSaveSelector' declared_type='SEL' type=':' index='4'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='5'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='saveToURL:ofType:forSaveOperation:error:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='saveOperation' declared_type='NSSaveOperationType' type='I' type64='Q' index='2'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAutosavedContentsFileURL:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFileModificationDate:'>
-      <arg name='modificationDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFileName:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFileType:'>
-      <arg name='typeName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFileURL:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHasUndoManager:'>
-      <arg name='hasUndoManager' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLastComponentOfFileName:'>
-      <arg name='str' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPrintInfo:'>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUndoManager:'>
-      <arg name='undoManager' declared_type='NSUndoManager*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWindow:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shouldChangePrintInfo:'>
-      <arg name='newPrintInfo' declared_type='NSPrintInfo*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='shouldCloseWindowController:delegate:shouldCloseSelector:contextInfo:'>
-      <arg name='windowController' declared_type='NSWindowController*' type='@' index='0'/>
-      <arg name='delegate' declared_type='id' type='@' index='1'/>
-      <arg name='shouldCloseSelector' declared_type='SEL' type=':' index='2'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shouldRunSavePanelWithAccessoryView'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='showWindows'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='undoManager'>
-      <retval declared_type='NSUndoManager*' type='@'/>
-    </method>
-    <method selector='updateChangeCount:'>
-      <arg name='change' declared_type='NSDocumentChangeType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='validateUserInterfaceItem:'>
-      <arg name='anItem' declared_type='id &lt;NSValidatedUserInterfaceItem&gt;' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='willPresentError:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <retval declared_type='NSError*' type='@'/>
-    </method>
-    <method selector='windowControllerDidLoadNib:'>
-      <arg name='windowController' declared_type='NSWindowController*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowControllerWillLoadNib:'>
-      <arg name='windowController' declared_type='NSWindowController*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowControllers'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='windowForSheet'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='windowNibName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='writableTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='writableTypesForSaveOperation:'>
-      <arg name='saveOperation' declared_type='NSSaveOperationType' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='writeSafelyToURL:ofType:forSaveOperation:error:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='saveOperation' declared_type='NSSaveOperationType' type='I' type64='Q' index='2'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToFile:ofType:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToFile:ofType:originalFile:saveOperation:'>
-      <arg name='fullDocumentPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='documentTypeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='fullOriginalDocumentPath' declared_type='NSString*' type='@' index='2'/>
-      <arg name='saveOperationType' declared_type='NSSaveOperationType' type='I' type64='Q' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToURL:ofType:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToURL:ofType:error:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToURL:ofType:forSaveOperation:originalContentsURL:error:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='saveOperation' declared_type='NSSaveOperationType' type='I' type64='Q' index='2'/>
-      <arg name='absoluteOriginalContentsURL' declared_type='NSURL*' type='@' index='3'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='4'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeWithBackupToFile:ofType:saveOperation:'>
-      <arg name='fullDocumentPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='documentTypeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='saveOperationType' declared_type='NSSaveOperationType' type='I' type64='Q' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSDocumentController'>
-    <method selector='URLsFromRunningOpenPanel'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='addDocument:'>
-      <arg name='document' declared_type='NSDocument*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='autosavingDelay'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='clearRecentDocuments:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='closeAllDocumentsWithDelegate:didCloseAllSelector:contextInfo:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <arg name='didCloseAllSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='currentDirectory'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='currentDocument'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='defaultType'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='displayNameForType:'>
-      <arg name='typeName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='documentClassForType:'>
-      <arg name='typeName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='documentClassNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='documentForFileName:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='documentForURL:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='documentForWindow:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='documents'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='fileExtensionsFromType:'>
-      <arg name='typeName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='fileNamesFromRunningOpenPanel'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='hasEditedDocuments'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='makeDocumentForURL:withContentsOfURL:ofType:error:'>
-      <arg name='absoluteDocumentURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='absoluteDocumentContentsURL' declared_type='NSURL*' type='@' index='1'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='2'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='makeDocumentWithContentsOfFile:ofType:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='makeDocumentWithContentsOfURL:ofType:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='makeDocumentWithContentsOfURL:ofType:error:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='makeUntitledDocumentOfType:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='makeUntitledDocumentOfType:error:'>
-      <arg name='typeName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='maximumRecentDocumentCount'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='newDocument:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='noteNewRecentDocument:'>
-      <arg name='document' declared_type='NSDocument*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='noteNewRecentDocumentURL:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='openDocument:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='openDocumentWithContentsOfFile:display:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='display' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='openDocumentWithContentsOfURL:display:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='display' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='openDocumentWithContentsOfURL:display:error:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='displayDocument' declared_type='BOOL' type='B' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='openUntitledDocumentAndDisplay:error:'>
-      <arg name='displayDocument' declared_type='BOOL' type='B' index='0'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='openUntitledDocumentOfType:display:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <arg name='display' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='presentError:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='presentError:modalForWindow:delegate:didPresentSelector:contextInfo:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <arg name='window' declared_type='NSWindow*' type='@' index='1'/>
-      <arg name='delegate' declared_type='id' type='@' index='2'/>
-      <arg name='didPresentSelector' declared_type='SEL' type=':' index='3'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='recentDocumentURLs'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='removeDocument:'>
-      <arg name='document' declared_type='NSDocument*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='reopenDocumentForURL:withContentsOfURL:error:'>
-      <arg name='absoluteDocumentURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='absoluteDocumentContentsURL' declared_type='NSURL*' type='@' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='reviewUnsavedDocumentsWithAlertTitle:cancellable:delegate:didReviewAllSelector:contextInfo:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <arg name='cancellable' declared_type='BOOL' type='B' index='1'/>
-      <arg name='delegate' declared_type='id' type='@' index='2'/>
-      <arg name='didReviewAllSelector' declared_type='SEL' type=':' index='3'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='runModalOpenPanel:forTypes:'>
-      <arg name='openPanel' declared_type='NSOpenPanel*' type='@' index='0'/>
-      <arg name='types' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='saveAllDocuments:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutosavingDelay:'>
-      <arg name='autosavingDelay' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShouldCreateUI:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedDocumentController'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='shouldCreateUI'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='typeForContentsOfURL:error:'>
-      <arg name='inAbsoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='typeFromFileExtension:'>
-      <arg name='fileNameExtensionOrHFSFileType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='validateUserInterfaceItem:'>
-      <arg name='anItem' declared_type='id &lt;NSValidatedUserInterfaceItem&gt;' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='willPresentError:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <retval declared_type='NSError*' type='@'/>
-    </method>
-  </class>
-  <class name='NSDrawer'>
-    <method selector='close'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='close:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='contentSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='contentView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='edge'>
-      <retval declared_type='NSRectEdge' type='i' type64='Q'/>
-    </method>
-    <method selector='initWithContentSize:preferredEdge:'>
-      <arg name='contentSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='leadingOffset'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='maxContentSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='minContentSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='open'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='open:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='openOnEdge:'>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parentWindow'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='preferredEdge'>
-      <retval declared_type='NSRectEdge' type='i' type64='Q'/>
-    </method>
-    <method selector='setContentSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentView:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLeadingOffset:'>
-      <arg name='offset' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxContentSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinContentSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setParentWindow:'>
-      <arg name='parent' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPreferredEdge:'>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTrailingOffset:'>
-      <arg name='offset' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='state'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='toggle:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='trailingOffset'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-  </class>
-  <class name='NSEPSImageRep'>
-    <method selector='EPSRepresentation'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='boundingBox'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method class_method='true' selector='imageRepWithData:'>
-      <arg name='epsData' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:'>
-      <arg name='epsData' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='prepareGState'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSEvent'>
-    <method selector='CGEvent'>
-      <retval declared_type='CGEventRef' type='^{__CGEvent=}'/>
-    </method>
-    <method selector='absoluteX'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='absoluteY'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='absoluteZ'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='buttonMask'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='buttonNumber'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='capabilityMask'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='characters'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='charactersIgnoringModifiers'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='clickCount'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='context'>
-      <retval declared_type='NSGraphicsContext*' type='@'/>
-    </method>
-    <method selector='data1'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='data2'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='deltaX'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='deltaY'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='deltaZ'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='deviceID'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='enterExitEventWithType:location:modifierFlags:timestamp:windowNumber:context:eventNumber:trackingNumber:userData:'>
-      <arg name='type' declared_type='NSEventType' type='I' type64='Q' index='0'/>
-      <arg name='location' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='flags' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='time' declared_type='NSTimeInterval' type='d' index='3'/>
-      <arg name='wNum' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <arg name='context' declared_type='NSGraphicsContext*' type='@' index='5'/>
-      <arg name='eNum' declared_type='NSInteger' type='i' type64='q' index='6'/>
-      <arg name='tNum' declared_type='NSInteger' type='i' type64='q' index='7'/>
-      <arg name='data' declared_type='void*' type='^v' index='8'/>
-      <retval declared_type='NSEvent*' type='@'/>
-    </method>
-    <method selector='eventNumber'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='eventRef'>
-      <retval declared_type='void*' type='^v' const='true'/>
-    </method>
-    <method class_method='true' selector='eventWithCGEvent:'>
-      <arg name='cgEvent' declared_type='CGEventRef' type='^{__CGEvent=}' index='0'/>
-      <retval declared_type='NSEvent*' type='@'/>
-    </method>
-    <method class_method='true' selector='eventWithEventRef:'>
-      <arg name='eventRef' declared_type='void*' type='^v' const='true' index='0'/>
-      <retval declared_type='NSEvent*' type='@'/>
-    </method>
-    <method selector='isARepeat'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEnteringProximity'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='isMouseCoalescingEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keyCode'>
-      <retval declared_type='unsigned short' type='S'/>
-    </method>
-    <method class_method='true' selector='keyEventWithType:location:modifierFlags:timestamp:windowNumber:context:characters:charactersIgnoringModifiers:isARepeat:keyCode:'>
-      <arg name='type' declared_type='NSEventType' type='I' type64='Q' index='0'/>
-      <arg name='location' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='flags' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='time' declared_type='NSTimeInterval' type='d' index='3'/>
-      <arg name='wNum' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <arg name='context' declared_type='NSGraphicsContext*' type='@' index='5'/>
-      <arg name='keys' declared_type='NSString*' type='@' index='6'/>
-      <arg name='ukeys' declared_type='NSString*' type='@' index='7'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='8'/>
-      <arg name='code' declared_type='unsigned short' type='S' index='9'/>
-      <retval declared_type='NSEvent*' type='@'/>
-    </method>
-    <method selector='locationInWindow'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='modifierFlags'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='mouseEventWithType:location:modifierFlags:timestamp:windowNumber:context:eventNumber:clickCount:pressure:'>
-      <arg name='type' declared_type='NSEventType' type='I' type64='Q' index='0'/>
-      <arg name='location' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='flags' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='time' declared_type='NSTimeInterval' type='d' index='3'/>
-      <arg name='wNum' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <arg name='context' declared_type='NSGraphicsContext*' type='@' index='5'/>
-      <arg name='eNum' declared_type='NSInteger' type='i' type64='q' index='6'/>
-      <arg name='cNum' declared_type='NSInteger' type='i' type64='q' index='7'/>
-      <arg name='pressure' declared_type='float' type='f' index='8'/>
-      <retval declared_type='NSEvent*' type='@'/>
-    </method>
-    <method class_method='true' selector='mouseLocation'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method class_method='true' selector='otherEventWithType:location:modifierFlags:timestamp:windowNumber:context:subtype:data1:data2:'>
-      <arg name='type' declared_type='NSEventType' type='I' type64='Q' index='0'/>
-      <arg name='location' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='flags' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='time' declared_type='NSTimeInterval' type='d' index='3'/>
-      <arg name='wNum' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <arg name='context' declared_type='NSGraphicsContext*' type='@' index='5'/>
-      <arg name='subtype' declared_type='short' type='s' index='6'/>
-      <arg name='d1' declared_type='NSInteger' type='i' type64='q' index='7'/>
-      <arg name='d2' declared_type='NSInteger' type='i' type64='q' index='8'/>
-      <retval declared_type='NSEvent*' type='@'/>
-    </method>
-    <method selector='pointingDeviceID'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='pointingDeviceSerialNumber'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='pointingDeviceType'>
-      <retval declared_type='NSPointingDeviceType' type='I' type64='Q'/>
-    </method>
-    <method selector='pressure'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='rotation'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method class_method='true' selector='setMouseCoalescingEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='startPeriodicEventsAfterDelay:withPeriod:'>
-      <arg name='delay' declared_type='NSTimeInterval' type='d' index='0'/>
-      <arg name='period' declared_type='NSTimeInterval' type='d' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='stopPeriodicEvents'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='subtype'>
-      <retval declared_type='short' type='s'/>
-    </method>
-    <method selector='systemTabletID'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='tabletID'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='tangentialPressure'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='tilt'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='timestamp'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='trackingArea'>
-      <retval declared_type='NSTrackingArea*' type='@'/>
-    </method>
-    <method selector='trackingNumber'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='type'>
-      <retval declared_type='NSEventType' type='I' type64='Q'/>
-    </method>
-    <method selector='uniqueID'>
-      <retval declared_type='unsigned long long' type='Q'/>
-    </method>
-    <method selector='userData'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='vendorDefined'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='vendorID'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='vendorPointingDeviceType'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='window'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='windowNumber'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-  </class>
-  <class name='NSFileWrapper'>
-    <method selector='addFileWithPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='addFileWrapper:'>
-      <arg name='doc' declared_type='NSFileWrapper*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='addRegularFileWithContents:preferredFilename:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='filename' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='addSymbolicLinkWithDestination:preferredFilename:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='filename' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fileAttributes'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='fileWrappers'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='filename'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='icon'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='initDirectoryWithFileWrappers:'>
-      <arg name='docs' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initRegularFileWithContents:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initSymbolicLinkWithDestination:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithSerializedRepresentation:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isDirectory'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isRegularFile'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSymbolicLink'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keyForFileWrapper:'>
-      <arg name='doc' declared_type='NSFileWrapper*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='needsToBeUpdatedFromPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='preferredFilename'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='regularFileContents'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='removeFileWrapper:'>
-      <arg name='doc' declared_type='NSFileWrapper*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='serializedRepresentation'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='setFileAttributes:'>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFilename:'>
-      <arg name='filename' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIcon:'>
-      <arg name='icon' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPreferredFilename:'>
-      <arg name='filename' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='symbolicLinkDestination'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='updateFromPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToFile:atomically:updateFilenames:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='atomicFlag' declared_type='BOOL' type='B' index='1'/>
-      <arg name='updateFilenamesFlag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSFont'>
-    <method selector='advancementForGlyph:'>
-      <arg name='ag' declared_type='NSGlyph' type='I' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='afmDictionary'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='ascender'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='boldSystemFontOfSize:'>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='boundingRectForFont'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='boundingRectForGlyph:'>
-      <arg name='aGlyph' declared_type='NSGlyph' type='I' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='capHeight'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='controlContentFontOfSize:'>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='coveredCharacterSet'>
-      <retval declared_type='NSCharacterSet*' type='@'/>
-    </method>
-    <method selector='defaultLineHeightForFont'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='descender'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='displayName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='encodingScheme'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='familyName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fontDescriptor'>
-      <retval declared_type='NSFontDescriptor*' type='@'/>
-    </method>
-    <method selector='fontName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='fontWithDescriptor:size:'>
-      <arg name='fontDescriptor' declared_type='NSFontDescriptor*' type='@' index='0'/>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method class_method='true' selector='fontWithDescriptor:textTransform:'>
-      <arg name='fontDescriptor' declared_type='NSFontDescriptor*' type='@' index='0'/>
-      <arg name='textTransform' declared_type='NSAffineTransform*' type='@' index='1'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method class_method='true' selector='fontWithName:matrix:'>
-      <arg name='fontName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='fontMatrix' declared_type='CGFloat*' type='^f' type64='^d' const='true' index='1'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method class_method='true' selector='fontWithName:size:'>
-      <arg name='fontName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='getAdvancements:forGlyphs:count:'>
-      <arg name='advancements' declared_type='NSSizeArray' type='^{_NSSize=ff}' type64='^{CGSize=dd}' index='0'/>
-      <arg name='glyphs' declared_type='NSGlyph*' type='^I' const='true' index='1'/>
-      <arg name='glyphCount' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getAdvancements:forPackedGlyphs:length:'>
-      <arg name='advancements' declared_type='NSSizeArray' type='^{_NSSize=ff}' type64='^{CGSize=dd}' index='0'/>
-      <arg name='packedGlyphs' declared_type='void*' type='^v' const='true' index='1'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getBoundingRects:forGlyphs:count:'>
-      <arg name='bounds' declared_type='NSRectArray' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='glyphs' declared_type='NSGlyph*' type='^I' const='true' index='1'/>
-      <arg name='glyphCount' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='glyphIsEncoded:'>
-      <arg name='aGlyph' declared_type='NSGlyph' type='I' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='glyphPacking'>
-      <retval declared_type='NSMultibyteGlyphPacking' type='I' type64='Q'/>
-    </method>
-    <method selector='glyphWithName:'>
-      <arg name='aName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSGlyph' type='I'/>
-    </method>
-    <method selector='isBaseFont'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isFixedPitch'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='italicAngle'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='labelFontOfSize:'>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method class_method='true' selector='labelFontSize'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='leading'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='matrix'>
-      <retval declared_type='CGFloat*' type='^f' type64='^d' const='true'/>
-    </method>
-    <method selector='maximumAdvancement'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method class_method='true' selector='menuBarFontOfSize:'>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method class_method='true' selector='menuFontOfSize:'>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method class_method='true' selector='messageFontOfSize:'>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='mostCompatibleStringEncoding'>
-      <retval declared_type='NSStringEncoding' type='I' type64='Q'/>
-    </method>
-    <method selector='numberOfGlyphs'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='paletteFontOfSize:'>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='pointSize'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='positionOfGlyph:forCharacter:struckOverRect:'>
-      <arg name='aGlyph' declared_type='NSGlyph' type='I' index='0'/>
-      <arg name='aChar' declared_type='unichar' type='S' index='1'/>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='positionOfGlyph:precededByGlyph:isNominal:'>
-      <arg name='curGlyph' declared_type='NSGlyph' type='I' index='0'/>
-      <arg name='prevGlyph' declared_type='NSGlyph' type='I' index='1'/>
-      <arg name='nominal' declared_type='BOOL*' type='^B' index='2' type_modifier='o'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='positionOfGlyph:struckOverGlyph:metricsExist:'>
-      <arg name='curGlyph' declared_type='NSGlyph' type='I' index='0'/>
-      <arg name='prevGlyph' declared_type='NSGlyph' type='I' index='1'/>
-      <arg name='exist' declared_type='BOOL*' type='^B' index='2' type_modifier='o'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='positionOfGlyph:struckOverRect:metricsExist:'>
-      <arg name='aGlyph' declared_type='NSGlyph' type='I' index='0'/>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='exist' declared_type='BOOL*' type='^B' index='2' type_modifier='o'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='positionOfGlyph:withRelation:toBaseGlyph:totalAdvancement:metricsExist:'>
-      <arg name='thisGlyph' declared_type='NSGlyph' type='I' index='0'/>
-      <arg name='rel' declared_type='NSGlyphRelation' type='I' index='1'/>
-      <arg name='baseGlyph' declared_type='NSGlyph' type='I' index='2'/>
-      <arg name='adv' declared_type='NSSizePointer' type='^{_NSSize=ff}' index='3'/>
-      <arg name='exist' declared_type='BOOL*' type='^B' index='4' type_modifier='o'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='positionsForCompositeSequence:numberOfGlyphs:pointArray:'>
-      <arg name='someGlyphs' declared_type='NSGlyph*' type='^I' index='0'/>
-      <arg name='numGlyphs' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='points' declared_type='NSPointArray' type='^{_NSPoint=ff}' type64='^{CGPoint=dd}' index='2'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='preferredFontNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='printerFont'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='renderingMode'>
-      <retval declared_type='NSFontRenderingMode' type='I' type64='Q'/>
-    </method>
-    <method selector='screenFont'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='screenFontWithRenderingMode:'>
-      <arg name='renderingMode' declared_type='NSFontRenderingMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='set'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setInContext:'>
-      <arg name='graphicsContext' declared_type='NSGraphicsContext*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setPreferredFontNames:'>
-      <arg name='fontNameArray' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setUserFixedPitchFont:'>
-      <arg name='aFont' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setUserFont:'>
-      <arg name='aFont' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='smallSystemFontSize'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='systemFontOfSize:'>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method class_method='true' selector='systemFontSize'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='systemFontSizeForControlSize:'>
-      <arg name='controlSize' declared_type='NSControlSize' type='I' type64='Q' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='textTransform'>
-      <retval declared_type='NSAffineTransform*' type='@'/>
-    </method>
-    <method class_method='true' selector='titleBarFontOfSize:'>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method class_method='true' selector='toolTipsFontOfSize:'>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='underlinePosition'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='underlineThickness'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='useFont:'>
-      <arg name='fontName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='userFixedPitchFontOfSize:'>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method class_method='true' selector='userFontOfSize:'>
-      <arg name='fontSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='widthOfString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='xHeight'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-  </class>
-  <class name='NSFontDescriptor'>
-    <method selector='fontAttributes'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='fontDescriptorByAddingAttributes:'>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='NSFontDescriptor*' type='@'/>
-    </method>
-    <method selector='fontDescriptorWithFace:'>
-      <arg name='newFace' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSFontDescriptor*' type='@'/>
-    </method>
-    <method selector='fontDescriptorWithFamily:'>
-      <arg name='newFamily' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSFontDescriptor*' type='@'/>
-    </method>
-    <method class_method='true' selector='fontDescriptorWithFontAttributes:'>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='NSFontDescriptor*' type='@'/>
-    </method>
-    <method selector='fontDescriptorWithMatrix:'>
-      <arg name='matrix' declared_type='NSAffineTransform*' type='@' index='0'/>
-      <retval declared_type='NSFontDescriptor*' type='@'/>
-    </method>
-    <method class_method='true' selector='fontDescriptorWithName:matrix:'>
-      <arg name='fontName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='matrix' declared_type='NSAffineTransform*' type='@' index='1'/>
-      <retval declared_type='NSFontDescriptor*' type='@'/>
-    </method>
-    <method class_method='true' selector='fontDescriptorWithName:size:'>
-      <arg name='fontName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='size' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='NSFontDescriptor*' type='@'/>
-    </method>
-    <method selector='fontDescriptorWithSize:'>
-      <arg name='newPointSize' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSFontDescriptor*' type='@'/>
-    </method>
-    <method selector='fontDescriptorWithSymbolicTraits:'>
-      <arg name='symbolicTraits' declared_type='NSFontSymbolicTraits' type='I' index='0'/>
-      <retval declared_type='NSFontDescriptor*' type='@'/>
-    </method>
-    <method selector='initWithFontAttributes:'>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='matchingFontDescriptorWithMandatoryKeys:'>
-      <arg name='mandatoryKeys' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='NSFontDescriptor*' type='@'/>
-    </method>
-    <method selector='matchingFontDescriptorsWithMandatoryKeys:'>
-      <arg name='mandatoryKeys' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='matrix'>
-      <retval declared_type='NSAffineTransform*' type='@'/>
-    </method>
-    <method selector='objectForKey:'>
-      <arg name='anAttribute' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='pointSize'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='postscriptName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='symbolicTraits'>
-      <retval declared_type='NSFontSymbolicTraits' type='I'/>
-    </method>
-  </class>
-  <class name='NSFontManager'>
-    <method selector='action'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='addCollection:options:'>
-      <arg name='collectionName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='collectionOptions' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='addFontDescriptors:toCollection:'>
-      <arg name='descriptors' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='collectionName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addFontTrait:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='availableFontFamilies'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='availableFontNamesMatchingFontDescriptor:'>
-      <arg name='descriptor' declared_type='NSFontDescriptor*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='availableFontNamesWithTraits:'>
-      <arg name='someTraits' declared_type='NSFontTraitMask' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='availableFonts'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='availableMembersOfFontFamily:'>
-      <arg name='fam' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='collectionNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='convertAttributes:'>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='convertFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='convertFont:toFace:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <arg name='typeface' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='convertFont:toFamily:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <arg name='family' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='convertFont:toHaveTrait:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <arg name='trait' declared_type='NSFontTraitMask' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='convertFont:toNotHaveTrait:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <arg name='trait' declared_type='NSFontTraitMask' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='convertFont:toSize:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <arg name='size' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='convertFontTraits:'>
-      <arg name='traits' declared_type='NSFontTraitMask' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSFontTraitMask' type='I' type64='Q'/>
-    </method>
-    <method selector='convertWeight:ofFont:'>
-      <arg name='upFlag' declared_type='BOOL' type='B' index='0'/>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='1'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='currentFontAction'>
-      <retval declared_type='NSFontAction' type='I' type64='Q'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='fontDescriptorsInCollection:'>
-      <arg name='collectionNames' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='fontMenu:'>
-      <arg name='create' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='fontNamed:hasTraits:'>
-      <arg name='fName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='someTraits' declared_type='NSFontTraitMask' type='I' type64='Q' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fontPanel:'>
-      <arg name='create' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='NSFontPanel*' type='@'/>
-    </method>
-    <method selector='fontWithFamily:traits:weight:size:'>
-      <arg name='family' declared_type='NSString*' type='@' index='0'/>
-      <arg name='traits' declared_type='NSFontTraitMask' type='I' type64='Q' index='1'/>
-      <arg name='weight' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='size' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='isEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isMultiple'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='localizedNameForFamily:face:'>
-      <arg name='family' declared_type='NSString*' type='@' index='0'/>
-      <arg name='faceKey' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='modifyFont:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='modifyFontViaPanel:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderFrontFontPanel:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderFrontStylesPanel:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeCollection:'>
-      <arg name='collectionName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='removeFontDescriptor:fromCollection:'>
-      <arg name='descriptor' declared_type='NSFontDescriptor*' type='@' index='0'/>
-      <arg name='collection' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeFontTrait:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedFont'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='sendAction'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAction:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setFontManagerFactory:'>
-      <arg name='factoryId' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFontMenu:'>
-      <arg name='newMenu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setFontPanelFactory:'>
-      <arg name='factoryId' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedAttributes:isMultiple:'>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedFont:isMultiple:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTarget:'>
-      <arg name='aTarget' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedFontManager'>
-      <retval declared_type='NSFontManager*' type='@'/>
-    </method>
-    <method selector='target'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='traitsOfFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='NSFontTraitMask' type='I' type64='Q'/>
-    </method>
-    <method selector='weightOfFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-  </class>
-  <class name='NSFontPanel'>
-    <method selector='accessoryView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='isEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='panelConvertFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='reloadDefaultFontFamilies'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAccessoryView:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPanelFont:isMultiple:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedFontPanel'>
-      <retval declared_type='NSFontPanel*' type='@'/>
-    </method>
-    <method class_method='true' selector='sharedFontPanelExists'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='worksWhenModal'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSForm'>
-    <method selector='addEntry:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSFormCell*' type='@'/>
-    </method>
-    <method selector='cellAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='drawCellAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='indexOfCellWithTag:'>
-      <arg name='aTag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfSelectedItem'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='insertEntry:atIndex:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='NSFormCell*' type='@'/>
-    </method>
-    <method selector='removeEntryAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectTextAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBezeled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBordered:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEntryWidth:'>
-      <arg name='width' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrameSize:'>
-      <arg name='newSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setInterlineSpacing:'>
-      <arg name='spacing' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextAlignment:'>
-      <arg name='mode' declared_type='NSTextAlignment' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextBaseWritingDirection:'>
-      <arg name='writingDirection' declared_type='NSWritingDirection' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleAlignment:'>
-      <arg name='mode' declared_type='NSTextAlignment' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleBaseWritingDirection:'>
-      <arg name='writingDirection' declared_type='NSWritingDirection' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSFormCell'>
-    <method selector='attributedTitle'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='initTextCell:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isOpaque'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='placeholderAttributedString'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='placeholderString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setAttributedTitle:'>
-      <arg name='obj' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPlaceholderAttributedString:'>
-      <arg name='string' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPlaceholderString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleAlignment:'>
-      <arg name='mode' declared_type='NSTextAlignment' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleBaseWritingDirection:'>
-      <arg name='writingDirection' declared_type='NSWritingDirection' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleWidth:'>
-      <arg name='width' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleWithMnemonic:'>
-      <arg name='stringWithAmpersand' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='titleAlignment'>
-      <retval declared_type='NSTextAlignment' type='I' type64='Q'/>
-    </method>
-    <method selector='titleBaseWritingDirection'>
-      <retval declared_type='NSWritingDirection' type='i' type64='q'/>
-    </method>
-    <method selector='titleFont'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='titleWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='titleWidth:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-  </class>
-  <class name='NSGlyphGenerator'>
-    <method selector='generateGlyphsForGlyphStorage:desiredNumberOfCharacters:glyphIndex:characterIndex:'>
-      <arg name='glyphStorage' declared_type='id &lt;NSGlyphStorage&gt;' type='@' index='0'/>
-      <arg name='nChars' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='glyphIndex' declared_type='NSUInteger*' type='^I' type64='^Q' index='2'/>
-      <arg name='charIndex' declared_type='NSUInteger*' type='^I' type64='^Q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedGlyphGenerator'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSGlyphInfo'>
-    <method selector='characterCollection'>
-      <retval declared_type='NSCharacterCollection' type='I' type64='Q'/>
-    </method>
-    <method selector='characterIdentifier'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='glyphInfoWithCharacterIdentifier:collection:baseString:'>
-      <arg name='cid' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='characterCollection' declared_type='NSCharacterCollection' type='I' type64='Q' index='1'/>
-      <arg name='theString' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='NSGlyphInfo*' type='@'/>
-    </method>
-    <method class_method='true' selector='glyphInfoWithGlyph:forFont:baseString:'>
-      <arg name='glyph' declared_type='NSGlyph' type='I' index='0'/>
-      <arg name='font' declared_type='NSFont*' type='@' index='1'/>
-      <arg name='theString' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='NSGlyphInfo*' type='@'/>
-    </method>
-    <method class_method='true' selector='glyphInfoWithGlyphName:forFont:baseString:'>
-      <arg name='glyphName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='font' declared_type='NSFont*' type='@' index='1'/>
-      <arg name='theString' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='NSGlyphInfo*' type='@'/>
-    </method>
-    <method selector='glyphName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSGradient'>
-    <method selector='colorSpace'>
-      <retval declared_type='NSColorSpace*' type='@'/>
-    </method>
-    <method selector='drawFromCenter:radius:toCenter:radius:options:'>
-      <arg name='startCenter' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='startRadius' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='endCenter' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='2'/>
-      <arg name='endRadius' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <arg name='options' declared_type='NSGradientDrawingOptions' type='I' type64='Q' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawFromPoint:toPoint:options:'>
-      <arg name='startingPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='endingPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='options' declared_type='NSGradientDrawingOptions' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawInBezierPath:angle:'>
-      <arg name='path' declared_type='NSBezierPath*' type='@' index='0'/>
-      <arg name='angle' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawInBezierPath:relativeCenterPosition:'>
-      <arg name='path' declared_type='NSBezierPath*' type='@' index='0'/>
-      <arg name='relativeCenterPosition' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawInRect:angle:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='angle' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawInRect:relativeCenterPosition:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='relativeCenterPosition' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getColor:location:atIndex:'>
-      <arg name='color' declared_type='NSColor**' type='^@' index='0'/>
-      <arg name='location' declared_type='CGFloat*' type='^f' type64='^d' index='1'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithColors:'>
-      <arg name='colorArray' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithColors:atLocations:colorSpace:'>
-      <arg name='colorArray' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='locations' declared_type='CGFloat*' type='^f' type64='^d' const='true' index='1'/>
-      <arg name='colorSpace' declared_type='NSColorSpace*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method ignore='true' variadic='true' suggestion='Use other initializers.' selector='initWithColorsAndLocations:'>
-      <arg name='initWithColorsAndLocations' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithStartingColor:endingColor:'>
-      <arg name='startingColor' declared_type='NSColor*' type='@' index='0'/>
-      <arg name='endingColor' declared_type='NSColor*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='interpolatedColorAtLocation:'>
-      <arg name='location' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='numberOfColorStops'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-  </class>
-  <class name='NSGraphicsContext'>
-    <method selector='CIContext'>
-      <retval declared_type='CIContext*' type='@'/>
-    </method>
-    <method selector='attributes'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='colorRenderingIntent'>
-      <retval declared_type='NSColorRenderingIntent' type='i' type64='q'/>
-    </method>
-    <method selector='compositingOperation'>
-      <retval declared_type='NSCompositingOperation' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='currentContext'>
-      <retval declared_type='NSGraphicsContext*' type='@'/>
-    </method>
-    <method class_method='true' selector='currentContextDrawingToScreen'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='flushGraphics'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='focusStack'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='graphicsContextWithAttributes:'>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='NSGraphicsContext*' type='@'/>
-    </method>
-    <method class_method='true' selector='graphicsContextWithBitmapImageRep:'>
-      <arg name='bitmapRep' declared_type='NSBitmapImageRep*' type='@' index='0'/>
-      <retval declared_type='NSGraphicsContext*' type='@'/>
-    </method>
-    <method class_method='true' selector='graphicsContextWithGraphicsPort:flipped:'>
-      <arg name='graphicsPort' declared_type='void*' type='^v' index='0'/>
-      <arg name='initialFlippedState' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='NSGraphicsContext*' type='@'/>
-    </method>
-    <method class_method='true' selector='graphicsContextWithWindow:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='NSGraphicsContext*' type='@'/>
-    </method>
-    <method selector='graphicsPort'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='imageInterpolation'>
-      <retval declared_type='NSImageInterpolation' type='I' type64='Q'/>
-    </method>
-    <method selector='isDrawingToScreen'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isFlipped'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='patternPhase'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='restoreGraphicsState'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='restoreGraphicsState'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='saveGraphicsState'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='saveGraphicsState'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setColorRenderingIntent:'>
-      <arg name='renderingIntent' declared_type='NSColorRenderingIntent' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCompositingOperation:'>
-      <arg name='operation' declared_type='NSCompositingOperation' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setCurrentContext:'>
-      <arg name='context' declared_type='NSGraphicsContext*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFocusStack:'>
-      <arg name='stack' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setGraphicsState:'>
-      <arg name='gState' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImageInterpolation:'>
-      <arg name='interpolation' declared_type='NSImageInterpolation' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPatternPhase:'>
-      <arg name='phase' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShouldAntialias:'>
-      <arg name='antialias' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shouldAntialias'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSHelpManager'>
-    <method selector='contextHelpForObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='findString:inBook:'>
-      <arg name='query' declared_type='NSString*' type='@' index='0'/>
-      <arg name='book' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='isContextHelpModeActive'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='openHelpAnchor:inBook:'>
-      <arg name='anchor' declared_type='NSString*' type='@' index='0'/>
-      <arg name='book' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeContextHelpForObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContextHelp:forObject:'>
-      <arg name='attrString' declared_type='NSAttributedString*' type='@' index='0'/>
-      <arg name='object' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setContextHelpModeActive:'>
-      <arg name='active' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedHelpManager'>
-      <retval declared_type='NSHelpManager*' type='@'/>
-    </method>
-    <method selector='showContextHelpForObject:locationHint:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <arg name='pt' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSImage'>
-    <method selector='TIFFRepresentation'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='TIFFRepresentationUsingCompression:factor:'>
-      <arg name='comp' declared_type='NSTIFFCompression' type='I' type64='Q' index='0'/>
-      <arg name='aFloat' declared_type='float' type='f' index='1'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='addRepresentation:'>
-      <arg name='imageRep' declared_type='NSImageRep*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addRepresentations:'>
-      <arg name='imageReps' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='alignmentRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='bestRepresentationForDevice:'>
-      <arg name='deviceDescription' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='NSImageRep*' type='@'/>
-    </method>
-    <method selector='cacheDepthMatchesImageDepth'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cacheMode'>
-      <retval declared_type='NSImageCacheMode' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='canInitWithPasteboard:'>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cancelIncrementalLoad'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='compositeToPoint:fromRect:operation:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='compositeToPoint:fromRect:operation:fraction:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q' index='2'/>
-      <arg name='delta' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='compositeToPoint:operation:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='compositeToPoint:operation:fraction:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q' index='1'/>
-      <arg name='delta' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='dissolveToPoint:fraction:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='dissolveToPoint:fromRect:fraction:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawAtPoint:fromRect:operation:fraction:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='fromRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q' index='2'/>
-      <arg name='delta' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawInRect:fromRect:operation:fraction:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='fromRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='op' declared_type='NSCompositingOperation' type='I' type64='Q' index='2'/>
-      <arg name='delta' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawRepresentation:inRect:'>
-      <arg name='imageRep' declared_type='NSImageRep*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='imageFileTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageNamed:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='imagePasteboardTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageUnfilteredFileTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageUnfilteredPasteboardTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageUnfilteredTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='initByReferencingFile:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initByReferencingURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfFile:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithIconRef:'>
-      <arg name='iconRef' declared_type='IconRef' type='^{OpaqueIconRef=}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithPasteboard:'>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithSize:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isCachedSeparately'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isDataRetained'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isFlipped'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isTemplate'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isValid'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='lockFocus'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='lockFocusOnRepresentation:'>
-      <arg name='imageRepresentation' declared_type='NSImageRep*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='matchesOnMultipleResolution'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='prefersColorMatch'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='recache'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeRepresentation:'>
-      <arg name='imageRep' declared_type='NSImageRep*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='representations'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='scalesWhenResized'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAlignmentRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='aColor' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCacheDepthMatchesImageDepth:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCacheMode:'>
-      <arg name='mode' declared_type='NSImageCacheMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCachedSeparately:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDataRetained:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFlipped:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMatchesOnMultipleResolution:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setName:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setPrefersColorMatch:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setScalesWhenResized:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSize:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTemplate:'>
-      <arg name='isTemplate' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesEPSOnResolutionMismatch:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='size'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='unlockFocus'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='usesEPSOnResolutionMismatch'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSImageCell'>
-    <method selector='imageAlignment'>
-      <retval declared_type='NSImageAlignment' type='I' type64='Q'/>
-    </method>
-    <method selector='imageFrameStyle'>
-      <retval declared_type='NSImageFrameStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='imageScaling'>
-      <retval declared_type='NSImageScaling' type='I' type64='Q'/>
-    </method>
-    <method selector='setImageAlignment:'>
-      <arg name='newAlign' declared_type='NSImageAlignment' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImageFrameStyle:'>
-      <arg name='newStyle' declared_type='NSImageFrameStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImageScaling:'>
-      <arg name='newScaling' declared_type='NSImageScaling' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSImageRep'>
-    <method selector='bitsPerSample'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='canInitWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='canInitWithPasteboard:'>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='colorSpaceName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='draw'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='drawAtPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='drawInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasAlpha'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='imageFileTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imagePasteboardTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageRepClassForData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method class_method='true' selector='imageRepClassForFileType:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method class_method='true' selector='imageRepClassForPasteboardType:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method class_method='true' selector='imageRepClassForType:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method class_method='true' selector='imageRepWithContentsOfFile:'>
-      <arg name='filename' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='imageRepWithContentsOfURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='imageRepWithPasteboard:'>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='imageRepsWithContentsOfFile:'>
-      <arg name='filename' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageRepsWithContentsOfURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageRepsWithPasteboard:'>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageUnfilteredFileTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageUnfilteredPasteboardTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='imageUnfilteredTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='isOpaque'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='pixelsHigh'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='pixelsWide'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='registerImageRepClass:'>
-      <arg name='imageRepClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='registeredImageRepClasses'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='setAlpha:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBitsPerSample:'>
-      <arg name='anInt' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setColorSpaceName:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOpaque:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPixelsHigh:'>
-      <arg name='anInt' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPixelsWide:'>
-      <arg name='anInt' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSize:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='size'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method class_method='true' selector='unregisterImageRepClass:'>
-      <arg name='imageRepClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSImageView'>
-    <method selector='allowsCutCopyPaste'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='animates'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='imageAlignment'>
-      <retval declared_type='NSImageAlignment' type='I' type64='Q'/>
-    </method>
-    <method selector='imageFrameStyle'>
-      <retval declared_type='NSImageFrameStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='imageScaling'>
-      <retval declared_type='NSImageScaling' type='I' type64='Q'/>
-    </method>
-    <method selector='isEditable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAllowsCutCopyPaste:'>
-      <arg name='allow' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAnimates:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEditable:'>
-      <arg name='yn' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImage:'>
-      <arg name='newImage' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImageAlignment:'>
-      <arg name='newAlign' declared_type='NSImageAlignment' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImageFrameStyle:'>
-      <arg name='newStyle' declared_type='NSImageFrameStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImageScaling:'>
-      <arg name='newScaling' declared_type='NSImageScaling' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSInputManager'>
-    <method class_method='true' selector='currentInputManager'>
-      <retval declared_type='NSInputManager*' type='@'/>
-    </method>
-    <method class_method='true' selector='cycleToNextInputLanguage:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='cycleToNextInputServerInLanguage:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='handleMouseEvent:'>
-      <arg name='theMouseEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='initWithName:host:'>
-      <arg name='inputServerName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='hostName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSInputManager*' type='@'/>
-    </method>
-    <method selector='language'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='localizedInputManagerName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='markedTextAbandoned:'>
-      <arg name='cli' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='markedTextSelectionChanged:client:'>
-      <arg name='newSel' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='cli' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='server'>
-      <retval declared_type='NSInputServer*' type='@'/>
-    </method>
-    <method selector='wantsToDelayTextChangeNotifications'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='wantsToHandleMouseEvents'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='wantsToInterpretAllKeystrokes'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSInputServer'>
-    <method selector='initWithDelegate:name:'>
-      <arg name='aDelegate' declared_type='id' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSLayoutManager'>
-    <method selector='addTemporaryAttribute:value:forCharacterRange:'>
-      <arg name='attrName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='value' declared_type='id' type='@' index='1'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addTemporaryAttributes:forCharacterRange:'>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addTextContainer:'>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='allowsNonContiguousLayout'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='attachmentSizeForGlyphAtIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='attributedString'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='backgroundLayoutEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='boundingRectForGlyphRange:inTextContainer:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='boundsRectForTextBlock:atIndex:effectiveRange:'>
-      <arg name='block' declared_type='NSTextBlock*' type='@' index='0'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='effectiveGlyphRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='boundsRectForTextBlock:glyphRange:'>
-      <arg name='block' declared_type='NSTextBlock*' type='@' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='characterIndexForGlyphAtIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='characterRangeForGlyphRange:actualGlyphRange:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='actualGlyphRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='defaultAttachmentScaling'>
-      <retval declared_type='NSImageScaling' type='I' type64='Q'/>
-    </method>
-    <method selector='defaultBaselineOffsetForFont:'>
-      <arg name='theFont' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='defaultLineHeightForFont:'>
-      <arg name='theFont' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='deleteGlyphsInRange:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawBackgroundForGlyphRange:atPoint:'>
-      <arg name='glyphsToShow' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='origin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawGlyphsForGlyphRange:atPoint:'>
-      <arg name='glyphsToShow' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='origin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawStrikethroughForGlyphRange:strikethroughType:baselineOffset:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='strikethroughVal' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='baselineOffset' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <arg name='lineRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='3'/>
-      <arg name='lineGlyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='4'/>
-      <arg name='containerOrigin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='5'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawUnderlineForGlyphRange:underlineType:baselineOffset:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='underlineVal' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='baselineOffset' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <arg name='lineRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='3'/>
-      <arg name='lineGlyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='4'/>
-      <arg name='containerOrigin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='5'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawsOutsideLineFragmentForGlyphAtIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='ensureGlyphsForCharacterRange:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='ensureGlyphsForGlyphRange:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='ensureLayoutForBoundingRect:inTextContainer:'>
-      <arg name='bounds' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='ensureLayoutForCharacterRange:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='ensureLayoutForGlyphRange:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='ensureLayoutForTextContainer:'>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='extraLineFragmentRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='extraLineFragmentTextContainer'>
-      <retval declared_type='NSTextContainer*' type='@'/>
-    </method>
-    <method selector='extraLineFragmentUsedRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='firstTextView'>
-      <retval declared_type='NSTextView*' type='@'/>
-    </method>
-    <method selector='firstUnlaidCharacterIndex'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='firstUnlaidGlyphIndex'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='fractionOfDistanceThroughGlyphForPoint:inTextContainer:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='1'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='getFirstUnlaidCharacterIndex:glyphIndex:'>
-      <arg name='charIndex' declared_type='NSUInteger*' type='^I' type64='^Q' index='0'/>
-      <arg name='glyphIndex' declared_type='NSUInteger*' type='^I' type64='^Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getGlyphs:range:'>
-      <arg name='glyphArray' declared_type='NSGlyph*' type='^I' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method ignore='true' suggestion='Call glyphAtIndex: multiple times.' selector='getGlyphsInRange:glyphs:characterIndexes:glyphInscriptions:elasticBits:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='glyphBuffer' declared_type='NSGlyph*' type='^I' index='1'/>
-      <arg name='charIndexBuffer' declared_type='NSUInteger*' type='^I' type64='^Q' index='2'/>
-      <arg name='inscribeBuffer' declared_type='NSGlyphInscription*' type='^I' type64='^Q' index='3'/>
-      <arg name='elasticBuffer' declared_type='BOOL*' type='^B' index='4'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method ignore='true' suggestion='Call glyphAtIndex: multiple times.' selector='getGlyphsInRange:glyphs:characterIndexes:glyphInscriptions:elasticBits:bidiLevels:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='glyphBuffer' declared_type='NSGlyph*' type='^I' index='1'/>
-      <arg name='charIndexBuffer' declared_type='NSUInteger*' type='^I' type64='^Q' index='2'/>
-      <arg name='inscribeBuffer' declared_type='NSGlyphInscription*' type='^I' type64='^Q' index='3'/>
-      <arg name='elasticBuffer' declared_type='BOOL*' type='^B' index='4'/>
-      <arg name='bidiLevelBuffer' declared_type='unsigned char*' type='*' index='5'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method ignore='true' selector='getLineFragmentInsertionPointsForCharacterAtIndex:alternatePositions:inDisplayOrder:positions:characterIndexes:'>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='aFlag' declared_type='BOOL' type='B' index='1'/>
-      <arg name='dFlag' declared_type='BOOL' type='B' index='2'/>
-      <arg name='positions' declared_type='CGFloat*' type='^f' type64='^d' index='3'/>
-      <arg name='charIndexes' declared_type='NSUInteger*' type='^I' type64='^Q' index='4'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='glyphAtIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSGlyph' type='I'/>
-    </method>
-    <method selector='glyphAtIndex:isValidIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='isValidIndex' declared_type='BOOL*' type='^B' index='1' type_modifier='o'/>
-      <retval declared_type='NSGlyph' type='I'/>
-    </method>
-    <method selector='glyphGenerator'>
-      <retval declared_type='NSGlyphGenerator*' type='@'/>
-    </method>
-    <method selector='glyphIndexForCharacterAtIndex:'>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='glyphIndexForPoint:inTextContainer:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='1'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='glyphIndexForPoint:inTextContainer:fractionOfDistanceThroughGlyph:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='1'/>
-      <arg name='partialFraction' declared_type='CGFloat*' type='^f' type64='^d' index='2'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='glyphRangeForBoundingRect:inTextContainer:'>
-      <arg name='bounds' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='glyphRangeForBoundingRectWithoutAdditionalLayout:inTextContainer:'>
-      <arg name='bounds' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='glyphRangeForCharacterRange:actualCharacterRange:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='actualCharRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='glyphRangeForTextContainer:'>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='hasNonContiguousLayout'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hyphenationFactor'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertGlyph:atGlyphIndex:characterIndex:'>
-      <arg name='glyph' declared_type='NSGlyph' type='I' index='0'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertGlyphs:length:forStartingGlyphAtIndex:characterIndex:'>
-      <arg name='glyphs' declared_type='NSGlyph*' type='^I' const='true' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertTextContainer:atIndex:'>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='0'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='intAttribute:forGlyphAtIndex:'>
-      <arg name='attributeTag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='invalidateDisplayForCharacterRange:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='invalidateDisplayForGlyphRange:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='invalidateGlyphsForCharacterRange:changeInLength:actualCharacterRange:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='delta' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='actualCharRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='invalidateGlyphsOnLayoutInvalidationForGlyphRange:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='invalidateLayoutForCharacterRange:actualCharacterRange:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='actualCharRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='invalidateLayoutForCharacterRange:isSoft:actualCharacterRange:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <arg name='actualCharRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isValidGlyphIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='layoutManagerOwnsFirstResponderInWindow:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='layoutOptions'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='layoutRectForTextBlock:atIndex:effectiveRange:'>
-      <arg name='block' declared_type='NSTextBlock*' type='@' index='0'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='effectiveGlyphRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='layoutRectForTextBlock:glyphRange:'>
-      <arg name='block' declared_type='NSTextBlock*' type='@' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='lineFragmentRectForGlyphAtIndex:effectiveRange:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='effectiveGlyphRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='lineFragmentRectForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='effectiveGlyphRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='lineFragmentUsedRectForGlyphAtIndex:effectiveRange:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='effectiveGlyphRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='lineFragmentUsedRectForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='effectiveGlyphRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='locationForGlyphAtIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='notShownAttributeForGlyphAtIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='numberOfGlyphs'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='rangeOfNominallySpacedGlyphsContainingIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rectArrayForCharacterRange:withinSelectedCharacterRange:inTextContainer:rectCount:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='selCharRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='2'/>
-      <arg name='rectCount' declared_type='NSUInteger*' type='^I' type64='^Q' index='3'/>
-      <retval declared_type='NSRectArray' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='rectArrayForGlyphRange:withinSelectedGlyphRange:inTextContainer:rectCount:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='selGlyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='2'/>
-      <arg name='rectCount' declared_type='NSUInteger*' type='^I' type64='^Q' index='3'/>
-      <retval declared_type='NSRectArray' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='removeTemporaryAttribute:forCharacterRange:'>
-      <arg name='attrName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeTextContainerAtIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceGlyphAtIndex:withGlyph:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='newGlyph' declared_type='NSGlyph' type='I' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceTextStorage:'>
-      <arg name='newTextStorage' declared_type='NSTextStorage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rulerAccessoryViewForTextView:paragraphStyle:ruler:enabled:'>
-      <arg name='view' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='style' declared_type='NSParagraphStyle*' type='@' index='1'/>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='2'/>
-      <arg name='isEnabled' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='rulerMarkersForTextView:paragraphStyle:ruler:'>
-      <arg name='view' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='style' declared_type='NSParagraphStyle*' type='@' index='1'/>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='2'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='setAllowsNonContiguousLayout:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttachmentSize:forGlyphRange:'>
-      <arg name='attachmentSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundLayoutEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBoundsRect:forTextBlock:glyphRange:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='block' declared_type='NSTextBlock*' type='@' index='1'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCharacterIndex:forGlyphAtIndex:'>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDefaultAttachmentScaling:'>
-      <arg name='scaling' declared_type='NSImageScaling' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsOutsideLineFragment:forGlyphAtIndex:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setExtraLineFragmentRect:usedRect:textContainer:'>
-      <arg name='fragmentRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='usedRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGlyphGenerator:'>
-      <arg name='glyphGenerator' declared_type='NSGlyphGenerator*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHyphenationFactor:'>
-      <arg name='factor' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIntAttribute:value:forGlyphAtIndex:'>
-      <arg name='attributeTag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='val' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLayoutRect:forTextBlock:glyphRange:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='block' declared_type='NSTextBlock*' type='@' index='1'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineFragmentRect:forGlyphRange:usedRect:'>
-      <arg name='fragmentRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='usedRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocation:forStartOfGlyphRange:'>
-      <arg name='location' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocations:startingGlyphIndexes:count:forGlyphRange:'>
-      <arg name='locations' declared_type='NSPointArray' type='^{_NSPoint=ff}' type64='^{CGPoint=dd}' index='0'/>
-      <arg name='glyphIndexes' declared_type='NSUInteger*' type='^I' type64='^Q' index='1'/>
-      <arg name='count' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNotShownAttribute:forGlyphAtIndex:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsControlCharacters:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsInvisibleCharacters:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTemporaryAttributes:forCharacterRange:'>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextContainer:forGlyphRange:'>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextStorage:'>
-      <arg name='textStorage' declared_type='NSTextStorage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTypesetter:'>
-      <arg name='typesetter' declared_type='NSTypesetter*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTypesetterBehavior:'>
-      <arg name='theBehavior' declared_type='NSTypesetterBehavior' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesFontLeading:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesScreenFonts:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showAttachmentCell:inRect:characterIndex:'>
-      <arg name='cell' declared_type='NSCell*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='attachmentIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showPackedGlyphs:length:glyphRange:atPoint:font:color:printingAdjustment:'>
-      <arg name='glyphs' declared_type='char*' type='*' index='0'/>
-      <arg name='glyphLen' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='3'/>
-      <arg name='font' declared_type='NSFont*' type='@' index='4'/>
-      <arg name='color' declared_type='NSColor*' type='@' index='5'/>
-      <arg name='printingAdjustment' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='6'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showsControlCharacters'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='showsInvisibleCharacters'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='strikethroughGlyphRange:strikethroughType:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='strikethroughVal' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='lineRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='lineGlyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <arg name='containerOrigin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='substituteFontForFont:'>
-      <arg name='originalFont' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='temporaryAttribute:atCharacterIndex:effectiveRange:'>
-      <arg name='attrName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='temporaryAttribute:atCharacterIndex:longestEffectiveRange:inRange:'>
-      <arg name='attrName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <arg name='rangeLimit' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='temporaryAttributesAtCharacterIndex:effectiveRange:'>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='effectiveCharRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='temporaryAttributesAtCharacterIndex:longestEffectiveRange:inRange:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <arg name='rangeLimit' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='textContainerChangedGeometry:'>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textContainerChangedTextView:'>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textContainerForGlyphAtIndex:effectiveRange:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='effectiveGlyphRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSTextContainer*' type='@'/>
-    </method>
-    <method selector='textContainerForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='effectiveGlyphRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='NSTextContainer*' type='@'/>
-    </method>
-    <method selector='textContainers'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='textStorage'>
-      <retval declared_type='NSTextStorage*' type='@'/>
-    </method>
-    <method selector='textStorage:edited:range:changeInLength:invalidatedRange:'>
-      <arg name='str' declared_type='NSTextStorage*' type='@' index='0'/>
-      <arg name='editedMask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='newCharRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <arg name='delta' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <arg name='invalidatedCharRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textViewForBeginningOfSelection'>
-      <retval declared_type='NSTextView*' type='@'/>
-    </method>
-    <method selector='typesetter'>
-      <retval declared_type='NSTypesetter*' type='@'/>
-    </method>
-    <method selector='typesetterBehavior'>
-      <retval declared_type='NSTypesetterBehavior' type='i' type64='q'/>
-    </method>
-    <method selector='underlineGlyphRange:underlineType:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='underlineVal' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='lineRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='lineGlyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <arg name='containerOrigin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='usedRectForTextContainer:'>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='usesFontLeading'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='usesScreenFonts'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSLevelIndicator'>
-    <method selector='criticalValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='maxValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='minValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='numberOfMajorTickMarks'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='numberOfTickMarks'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='rectOfTickMarkAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='setCriticalValue:'>
-      <arg name='criticalValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxValue:'>
-      <arg name='maxValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinValue:'>
-      <arg name='minValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNumberOfMajorTickMarks:'>
-      <arg name='count' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNumberOfTickMarks:'>
-      <arg name='count' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTickMarkPosition:'>
-      <arg name='position' declared_type='NSTickMarkPosition' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWarningValue:'>
-      <arg name='warningValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tickMarkPosition'>
-      <retval declared_type='NSTickMarkPosition' type='I' type64='Q'/>
-    </method>
-    <method selector='tickMarkValueAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='warningValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-  </class>
-  <class name='NSLevelIndicatorCell'>
-    <method selector='criticalValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='initWithLevelIndicatorStyle:'>
-      <arg name='levelIndicatorStyle' declared_type='NSLevelIndicatorStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='levelIndicatorStyle'>
-      <retval declared_type='NSLevelIndicatorStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='maxValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='minValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='numberOfMajorTickMarks'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='numberOfTickMarks'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='rectOfTickMarkAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='setCriticalValue:'>
-      <arg name='criticalValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLevelIndicatorStyle:'>
-      <arg name='levelIndicatorStyle' declared_type='NSLevelIndicatorStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxValue:'>
-      <arg name='maxValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinValue:'>
-      <arg name='minValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNumberOfMajorTickMarks:'>
-      <arg name='count' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNumberOfTickMarks:'>
-      <arg name='count' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTickMarkPosition:'>
-      <arg name='position' declared_type='NSTickMarkPosition' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWarningValue:'>
-      <arg name='warningValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tickMarkPosition'>
-      <retval declared_type='NSTickMarkPosition' type='I' type64='Q'/>
-    </method>
-    <method selector='tickMarkValueAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='warningValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-  </class>
-  <class name='NSMatrix'>
-    <method selector='acceptsFirstMouse:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='addColumn'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addColumnWithCells:'>
-      <arg name='newCells' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addRow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addRowWithCells:'>
-      <arg name='newCells' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='allowsEmptySelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='autosizesCells'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='cellAtRow:column:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='cellBackgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='cellClass'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='cellFrameAtRow:column:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='cellSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='cellWithTag:'>
-      <arg name='anInt' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='cells'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='deselectAllCells'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deselectSelectedCell'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='doubleAction'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='drawCellAtRow:column:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawsBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='drawsCellBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='getNumberOfRows:columns:'>
-      <arg name='rowCount' declared_type='NSInteger*' type='^i' type64='^q' index='0'/>
-      <arg name='colCount' declared_type='NSInteger*' type='^i' type64='^q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getRow:column:forPoint:'>
-      <arg name='row' declared_type='NSInteger*' type='^i' type64='^q' index='0'/>
-      <arg name='col' declared_type='NSInteger*' type='^i' type64='^q' index='1'/>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='getRow:column:ofCell:'>
-      <arg name='row' declared_type='NSInteger*' type='^i' type64='^q' index='0'/>
-      <arg name='col' declared_type='NSInteger*' type='^i' type64='^q' index='1'/>
-      <arg name='aCell' declared_type='NSCell*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='highlightCell:atRow:column:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithFrame:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithFrame:mode:cellClass:numberOfRows:numberOfColumns:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='aMode' declared_type='NSMatrixMode' type='I' type64='Q' index='1'/>
-      <arg name='factoryId' declared_type='Class' type='#' index='2'/>
-      <arg name='rowsHigh' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <arg name='colsWide' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithFrame:mode:prototype:numberOfRows:numberOfColumns:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='aMode' declared_type='NSMatrixMode' type='I' type64='Q' index='1'/>
-      <arg name='aCell' declared_type='NSCell*' type='@' index='2'/>
-      <arg name='rowsHigh' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <arg name='colsWide' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertColumn:withCells:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='newCells' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertRow:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertRow:withCells:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='newCells' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='intercellSpacing'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='isAutoscroll'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSelectionByRect'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keyCell'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='makeCellAtRow:column:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='NSCell*' type='@'/>
-    </method>
-    <method selector='mode'>
-      <retval declared_type='NSMatrixMode' type='I' type64='Q'/>
-    </method>
-    <method selector='mouseDown:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='mouseDownFlags'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='numberOfColumns'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='numberOfRows'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='performKeyEquivalent:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='prototype'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='putCell:atRow:column:'>
-      <arg name='newCell' declared_type='NSCell*' type='@' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeColumn:'>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeRow:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='renewRows:columns:'>
-      <arg name='newRows' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='newCols' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resetCursorRects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollCellToVisibleAtRow:column:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectAll:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectCellAtRow:column:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectCellWithTag:'>
-      <arg name='anInt' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectText:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectTextAtRow:column:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='selectedCell'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='selectedCells'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='selectedColumn'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='selectedRow'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='sendAction'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='sendAction:to:forAllCells:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sendDoubleAction'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsEmptySelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutoscroll:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutosizesCells:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCellBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCellClass:'>
-      <arg name='factoryId' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCellSize:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDoubleAction:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsBackground:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsCellBackground:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIntercellSpacing:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKeyCell:'>
-      <arg name='keyCell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMode:'>
-      <arg name='aMode' declared_type='NSMatrixMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPrototype:'>
-      <arg name='aCell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setScrollable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectionByRect:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectionFrom:to:anchor:highlight:'>
-      <arg name='startPos' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='endPos' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='anchorPos' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='lit' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setState:atRow:column:'>
-      <arg name='value' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTabKeyTraversesCells:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setToolTip:forCell:'>
-      <arg name='toolTipString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='cell' declared_type='NSCell*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValidateSize:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sizeToCells'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sortUsingFunction:context:'>
-      <arg name='compare' function_pointer='true' declared_type='NSInteger *id, id, void*' type='^?' index='0' type_modifier='n'>
-        <arg declared_type='id' type='@'/>
-        <arg declared_type='id' type='@'/>
-        <arg declared_type='void*' type='^v'/>
-        <retval declared_type='NSInteger' type='i' type64='q'/>
-      </arg>
-      <arg name='context' declared_type='void*' type='^v' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sortUsingSelector:'>
-      <arg name='comparator' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tabKeyTraversesCells'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='textDidBeginEditing:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textDidChange:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textDidEndEditing:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textShouldBeginEditing:'>
-      <arg name='textObject' declared_type='NSText*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='textShouldEndEditing:'>
-      <arg name='textObject' declared_type='NSText*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='toolTipForCell:'>
-      <arg name='cell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSMenu'>
-    <method selector='addItem:'>
-      <arg name='newItem' declared_type='NSMenuItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addItemWithTitle:action:keyEquivalent:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='aSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='charCode' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='attachedMenu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='autoenablesItems'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cancelTracking'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='contextMenuRepresentation'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='helpRequested:'>
-      <arg name='eventPtr' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='highlightedItem'>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='indexOfItem:'>
-      <arg name='index' declared_type='NSMenuItem*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithRepresentedObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithSubmenu:'>
-      <arg name='submenu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithTag:'>
-      <arg name='aTag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithTarget:andAction:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <arg name='actionSelector' declared_type='SEL' type=':' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithTitle:'>
-      <arg name='aTitle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='initWithTitle:'>
-      <arg name='aTitle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertItem:atIndex:'>
-      <arg name='newItem' declared_type='NSMenuItem*' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertItemWithTitle:action:keyEquivalent:atIndex:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='aSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='charCode' declared_type='NSString*' type='@' index='2'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='isAttached'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isTornOff'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='itemArray'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='itemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='itemChanged:'>
-      <arg name='item' declared_type='NSMenuItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='itemWithTag:'>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='itemWithTitle:'>
-      <arg name='aTitle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='locationForSubmenu:'>
-      <arg name='aSubmenu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='menuBarHeight'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='menuBarVisible'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='menuChangedMessagesEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='menuRepresentation'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='menuZone'>
-      <retval declared_type='NSZone*' type='^{_NSZone=}'/>
-    </method>
-    <method selector='numberOfItems'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='performActionForItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performKeyEquivalent:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='popUpContextMenu:withEvent:forView:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='1'/>
-      <arg name='view' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='popUpContextMenu:withEvent:forView:withFont:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='1'/>
-      <arg name='view' declared_type='NSView*' type='@' index='2'/>
-      <arg name='font' declared_type='NSFont*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeItem:'>
-      <arg name='item' declared_type='NSMenuItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutoenablesItems:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContextMenuRepresentation:'>
-      <arg name='menuRep' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setMenuBarVisible:'>
-      <arg name='visible' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenuChangedMessagesEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenuRepresentation:'>
-      <arg name='menuRep' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setMenuZone:'>
-      <arg name='aZone' declared_type='NSZone*' type='^{_NSZone=}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsStateColumn:'>
-      <arg name='showsState' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSubmenu:forItem:'>
-      <arg name='aMenu' declared_type='NSMenu*' type='@' index='0'/>
-      <arg name='anItem' declared_type='NSMenuItem*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSupermenu:'>
-      <arg name='supermenu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTearOffMenuRepresentation:'>
-      <arg name='menuRep' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showsStateColumn'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='sizeToFit'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='submenuAction:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='supermenu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='tearOffMenuRepresentation'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='update'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSMenuItem'>
-    <method selector='action'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='attributedTitle'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='hasSubmenu'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='indentationLevel'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='initWithTitle:action:keyEquivalent:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='aSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='charCode' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isAlternate'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isHidden'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isHiddenOrHasHiddenAncestor'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isHighlighted'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSeparatorItem'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keyEquivalent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='keyEquivalentModifierMask'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='menu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='mixedStateImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='mnemonic'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='mnemonicLocation'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='offStateImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='onStateImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='representedObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='separatorItem'>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='setAction:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlternate:'>
-      <arg name='isAlternate' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedTitle:'>
-      <arg name='string' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHidden:'>
-      <arg name='hidden' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImage:'>
-      <arg name='menuImage' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIndentationLevel:'>
-      <arg name='indentationLevel' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKeyEquivalent:'>
-      <arg name='aKeyEquivalent' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKeyEquivalentModifierMask:'>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenu:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMixedStateImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMnemonicLocation:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOffStateImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOnStateImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRepresentedObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setState:'>
-      <arg name='state' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSubmenu:'>
-      <arg name='submenu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTag:'>
-      <arg name='anInt' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTarget:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleWithMnemonic:'>
-      <arg name='stringWithAmpersand' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setToolTip:'>
-      <arg name='toolTip' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setUsesUserKeyEquivalents:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='state'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='submenu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='tag'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='target'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='toolTip'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='userKeyEquivalent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='usesUserKeyEquivalents'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='view'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-  </class>
-  <class name='NSMenuItemCell'>
-    <method selector='calcSize'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawBorderAndBackgroundWithFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawImageWithFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawKeyEquivalentWithFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawSeparatorItemWithFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawStateImageWithFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawTitleWithFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='imageWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='keyEquivalentRectForBounds:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='keyEquivalentWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='menuItem'>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='menuView'>
-      <retval declared_type='NSMenuView*' type='@'/>
-    </method>
-    <method selector='needsDisplay'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='needsSizing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setMenuItem:'>
-      <arg name='item' declared_type='NSMenuItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenuView:'>
-      <arg name='menuView' declared_type='NSMenuView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNeedsDisplay:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNeedsSizing:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stateImageRectForBounds:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='stateImageWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='tag'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='titleRectForBounds:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='titleWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-  </class>
-  <class name='NSMenuView'>
-    <method selector='attachSubmenuForItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='attachedMenu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='attachedMenuView'>
-      <retval declared_type='NSMenuView*' type='@'/>
-    </method>
-    <method selector='detachSubmenu'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='font'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='highlightedItemIndex'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='horizontalEdgePadding'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='imageAndTitleOffset'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='imageAndTitleWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='indexOfItemAtPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='initAsTearOff'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithFrame:'>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='innerRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='isAttached'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isHorizontal'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isTornOff'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='itemAdded:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='itemChanged:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='itemRemoved:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='keyEquivalentOffset'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='keyEquivalentWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='locationForSubmenu:'>
-      <arg name='aSubmenu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='menu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method class_method='true' selector='menuBarHeight'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='menuItemCellForItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSMenuItemCell*' type='@'/>
-    </method>
-    <method selector='needsSizing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='performActionWithHighlightingForItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rectOfItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='setFont:'>
-      <arg name='font' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHighlightedItemIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHorizontal:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHorizontalEdgePadding:'>
-      <arg name='pad' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenu:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenuItemCell:forItemAtIndex:'>
-      <arg name='cell' declared_type='NSMenuItemCell*' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNeedsDisplayForItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNeedsSizing:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWindowFrameForAttachingToRect:onScreen:preferredEdge:popUpSelectedItem:'>
-      <arg name='screenRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='screen' declared_type='NSScreen*' type='@' index='1'/>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='2'/>
-      <arg name='selectedItemIndex' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sizeToFit'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stateImageOffset'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='stateImageWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='trackWithEvent:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='update'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSMovie'>
-    <method selector='QTMovie'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='URL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method class_method='true' selector='canInitWithPasteboard:'>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initWithMovie:'>
-      <arg name='movie' declared_type='void*' type='^v' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithPasteboard:'>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithURL:byReference:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='byRef' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='movieUnfilteredFileTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='movieUnfilteredPasteboardTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSMovieView'>
-    <method selector='clear:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='copy:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='cut:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='delete:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='gotoBeginning:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='gotoEnd:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='gotoPosterFrame:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isControllerVisible'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEditable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isMuted'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isPlaying'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='loopMode'>
-      <retval declared_type='NSQTMovieLoopMode' type='I'/>
-    </method>
-    <method selector='movie'>
-      <retval declared_type='NSMovie*' type='@'/>
-    </method>
-    <method selector='movieController'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='movieRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='paste:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='playsEveryFrame'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='playsSelectionOnly'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rate'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='resizeWithMagnification:'>
-      <arg name='magnification' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectAll:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEditable:'>
-      <arg name='editable' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLoopMode:'>
-      <arg name='mode' declared_type='NSQTMovieLoopMode' type='I' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMovie:'>
-      <arg name='movie' declared_type='NSMovie*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMuted:'>
-      <arg name='mute' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPlaysEveryFrame:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPlaysSelectionOnly:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRate:'>
-      <arg name='rate' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVolume:'>
-      <arg name='volume' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showController:adjustingSize:'>
-      <arg name='show' declared_type='BOOL' type='B' index='0'/>
-      <arg name='adjustSize' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sizeForMagnification:'>
-      <arg name='magnification' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='start:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stepBack:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stepForward:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stop:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='volume'>
-      <retval declared_type='float' type='f'/>
-    </method>
-  </class>
-  <class name='NSMutableAttributedString'>
-    <method selector='addAttribute:value:range:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='value' declared_type='id' type='@' index='1'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addAttributes:range:'>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendAttributedString:'>
-      <arg name='attrString' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applyFontTraits:range:'>
-      <arg name='traitMask' declared_type='NSFontTraitMask' type='I' type64='Q' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='beginEditing'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteCharactersInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='endEditing'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='fixAttachmentAttributeInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='fixAttributesInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='fixFontAttributeInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='fixParagraphStyleAttributeInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertAttributedString:atIndex:'>
-      <arg name='attrString' declared_type='NSAttributedString*' type='@' index='0'/>
-      <arg name='loc' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='mutableString'>
-      <retval declared_type='NSMutableString*' type='@'/>
-    </method>
-    <method selector='readFromData:options:documentAttributes:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='options' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='readFromData:options:documentAttributes:error:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='opts' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='2'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='readFromURL:options:documentAttributes:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='options' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='readFromURL:options:documentAttributes:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='opts' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='dict' declared_type='NSDictionary**' type='^@' index='2'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='removeAttribute:range:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceCharactersInRange:withAttributedString:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='attrString' declared_type='NSAttributedString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceCharactersInRange:withString:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='str' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlignment:range:'>
-      <arg name='alignment' declared_type='NSTextAlignment' type='I' type64='Q' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedString:'>
-      <arg name='attrString' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributes:range:'>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBaseWritingDirection:range:'>
-      <arg name='writingDirection' declared_type='NSWritingDirection' type='i' type64='q' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='subscriptRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='superscriptRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='unscriptRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='updateAttachmentsFromPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSMutableParagraphStyle'>
-    <method selector='addTabStop:'>
-      <arg name='anObject' declared_type='NSTextTab*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeTabStop:'>
-      <arg name='anObject' declared_type='NSTextTab*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlignment:'>
-      <arg name='alignment' declared_type='NSTextAlignment' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBaseWritingDirection:'>
-      <arg name='writingDirection' declared_type='NSWritingDirection' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDefaultTabInterval:'>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFirstLineHeadIndent:'>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHeadIndent:'>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHeaderLevel:'>
-      <arg name='level' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHyphenationFactor:'>
-      <arg name='aFactor' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineBreakMode:'>
-      <arg name='mode' declared_type='NSLineBreakMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineHeightMultiple:'>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineSpacing:'>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaximumLineHeight:'>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinimumLineHeight:'>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setParagraphSpacing:'>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setParagraphSpacingBefore:'>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setParagraphStyle:'>
-      <arg name='obj' declared_type='NSParagraphStyle*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTabStops:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTailIndent:'>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextBlocks:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextLists:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTighteningFactorForTruncation:'>
-      <arg name='aFactor' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSNib'>
-    <method selector='initWithContentsOfURL:'>
-      <arg name='nibFileURL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithNibNamed:bundle:'>
-      <arg name='nibName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='bundle' declared_type='NSBundle*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='instantiateNibWithExternalNameTable:'>
-      <arg name='externalNameTable' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='instantiateNibWithOwner:topLevelObjects:'>
-      <arg name='owner' declared_type='id' type='@' index='0'/>
-      <arg name='topLevelObjects' declared_type='NSArray**' type='^@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSNibConnector'>
-    <method selector='destination'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='establishConnection'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='label'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='replaceObject:withObject:'>
-      <arg name='oldObject' declared_type='id' type='@' index='0'/>
-      <arg name='newObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDestination:'>
-      <arg name='destination' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLabel:'>
-      <arg name='label' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSource:'>
-      <arg name='source' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='source'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSNibControlConnector'>
-    <method selector='establishConnection'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSNibOutletConnector'>
-    <method selector='establishConnection'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSObject'>
-    <method selector='accessibilityActionDescription:'>
-      <arg name='action' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='accessibilityActionNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='accessibilityAttributeNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='accessibilityAttributeValue:'>
-      <arg name='attribute' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='accessibilityAttributeValue:forParameter:'>
-      <arg name='attribute' declared_type='NSString*' type='@' index='0'/>
-      <arg name='parameter' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='accessibilityFocusedUIElement'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='accessibilityHitTest:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='accessibilityIsAttributeSettable:'>
-      <arg name='attribute' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='accessibilityIsIgnored'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='accessibilityParameterizedAttributeNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='accessibilityPerformAction:'>
-      <arg name='action' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='accessibilitySetOverrideValue:forAttribute:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='attribute' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='accessibilitySetValue:forAttribute:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='attribute' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='action'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='activeConversationChanged:toNewConversation:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <arg name='newConversation' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='activeConversationWillChange:fromOldConversation:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <arg name='oldConversation' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='alertShowHelp:'>
-      <arg name='alert' declared_type='NSAlert*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='alphaControlAddedOrRemoved:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='animation:didReachProgressMark:'>
-      <arg name='animation' declared_type='NSAnimation*' type='@' index='0'/>
-      <arg name='progress' declared_type='NSAnimationProgress' type='f' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='animation:valueForProgress:'>
-      <arg name='animation' declared_type='NSAnimation*' type='@' index='0'/>
-      <arg name='progress' declared_type='NSAnimationProgress' type='f' index='1'/>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='animationDidEnd:'>
-      <arg name='animation' declared_type='NSAnimation*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='animationDidStop:'>
-      <arg name='animation' declared_type='NSAnimation*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='animationForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='animationShouldStart:'>
-      <arg name='animation' declared_type='NSAnimation*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='animations'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='animator'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='application:delegateHandlesKey:'>
-      <arg name='sender' declared_type='NSApplication*' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='application:openFile:'>
-      <arg name='sender' declared_type='NSApplication*' type='@' index='0'/>
-      <arg name='filename' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='application:openFileWithoutUI:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <arg name='filename' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='application:openFiles:'>
-      <arg name='sender' declared_type='NSApplication*' type='@' index='0'/>
-      <arg name='filenames' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='application:openTempFile:'>
-      <arg name='sender' declared_type='NSApplication*' type='@' index='0'/>
-      <arg name='filename' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='application:printFile:'>
-      <arg name='sender' declared_type='NSApplication*' type='@' index='0'/>
-      <arg name='filename' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='application:printFiles:'>
-      <arg name='sender' declared_type='NSApplication*' type='@' index='0'/>
-      <arg name='filenames' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='application:printFiles:withSettings:showPrintPanels:'>
-      <arg name='application' declared_type='NSApplication*' type='@' index='0'/>
-      <arg name='fileNames' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='printSettings' declared_type='NSDictionary*' type='@' index='2'/>
-      <arg name='showPrintPanels' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='NSApplicationPrintReply' type='I' type64='Q'/>
-    </method>
-    <method selector='application:willPresentError:'>
-      <arg name='application' declared_type='NSApplication*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError*' type='@' index='1'/>
-      <retval declared_type='NSError*' type='@'/>
-    </method>
-    <method selector='applicationDidBecomeActive:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationDidChangeScreenParameters:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationDidFinishLaunching:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationDidHide:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationDidResignActive:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationDidUnhide:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationDidUpdate:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationDockMenu:'>
-      <arg name='sender' declared_type='NSApplication*' type='@' index='0'/>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='applicationOpenUntitledFile:'>
-      <arg name='sender' declared_type='NSApplication*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='applicationShouldHandleReopen:hasVisibleWindows:'>
-      <arg name='sender' declared_type='NSApplication*' type='@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='applicationShouldOpenUntitledFile:'>
-      <arg name='sender' declared_type='NSApplication*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='applicationShouldTerminate:'>
-      <arg name='sender' declared_type='NSApplication*' type='@' index='0'/>
-      <retval declared_type='NSApplicationTerminateReply' type='I' type64='Q'/>
-    </method>
-    <method selector='applicationShouldTerminateAfterLastWindowClosed:'>
-      <arg name='sender' declared_type='NSApplication*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='applicationWillBecomeActive:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationWillFinishLaunching:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationWillHide:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationWillResignActive:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationWillTerminate:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationWillUnhide:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationWillUpdate:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='attachColorList:'>
-      <arg name='colorList' declared_type='NSColorList*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='attachment'>
-      <retval declared_type='NSTextAttachment*' type='@'/>
-    </method>
-    <method selector='attributedString'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='attributedString'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='attributedSubstringForProposedRange:actualRange:'>
-      <arg name='aRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='actualRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='attributedSubstringFromRange:'>
-      <arg name='theRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='awakeFromNib'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='baselineDeltaForCharacterAtIndex:'>
-      <arg name='anIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='bind:toObject:withKeyPath:options:'>
-      <arg name='binding' declared_type='NSString*' type='@' index='0'/>
-      <arg name='observable' declared_type='id' type='@' index='1'/>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='2'/>
-      <arg name='options' declared_type='NSDictionary*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='browser:acceptDrop:atRow:column:dropOperation:'>
-      <arg name='browser' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='info' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='1'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <arg name='dropOperation' declared_type='NSBrowserDropOperation' type='I' type64='Q' index='4'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='browser:canDragRowsWithIndexes:inColumn:withEvent:'>
-      <arg name='browser' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='rowIndexes' declared_type='NSIndexSet*' type='@' index='1'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='browser:createRowsForColumn:inMatrix:'>
-      <arg name='sender' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='matrix' declared_type='NSMatrix*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:'>
-      <arg name='browser' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='rowIndexes' declared_type='NSIndexSet*' type='@' index='1'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='3'/>
-      <arg name='dragImageOffset' declared_type='NSPointPointer' type='^{_NSPoint=ff}' type64='^{CGPoint=dd}' index='4'/>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='browser:isColumnValid:'>
-      <arg name='sender' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='browser:namesOfPromisedFilesDroppedAtDestination:forDraggedRowsWithIndexes:inColumn:'>
-      <arg name='browser' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='dropDestination' declared_type='NSURL*' type='@' index='1'/>
-      <arg name='rowIndexes' declared_type='NSIndexSet*' type='@' index='2'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='browser:nextTypeSelectMatchFromRow:toRow:inColumn:forString:'>
-      <arg name='browser' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='startRow' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='endRow' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <arg name='searchString' declared_type='NSString*' type='@' index='4'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='browser:numberOfRowsInColumn:'>
-      <arg name='sender' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='browser:selectCellWithString:inColumn:'>
-      <arg name='sender' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='title' declared_type='NSString*' type='@' index='1'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='browser:selectRow:inColumn:'>
-      <arg name='sender' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='browser:shouldShowCellExpansionForRow:column:'>
-      <arg name='browser' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='browser:shouldSizeColumn:forUserResize:toWidth:'>
-      <arg name='browser' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='columnIndex' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='forUserResize' declared_type='BOOL' type='B' index='2'/>
-      <arg name='suggestedWidth' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='browser:shouldTypeSelectForEvent:withCurrentSearchString:'>
-      <arg name='browser' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='1'/>
-      <arg name='searchString' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='browser:sizeToFitWidthOfColumn:'>
-      <arg name='browser' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='columnIndex' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='browser:titleOfColumn:'>
-      <arg name='sender' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='browser:typeSelectStringForRow:inColumn:'>
-      <arg name='browser' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='browser:validateDrop:proposedRow:column:dropOperation:'>
-      <arg name='browser' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='info' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='1'/>
-      <arg name='row' declared_type='NSInteger*' type='^i' type64='^q' index='2'/>
-      <arg name='column' declared_type='NSInteger*' type='^i' type64='^q' index='3'/>
-      <arg name='dropOperation' declared_type='NSBrowserDropOperation*' type='^I' type64='^Q' index='4'/>
-      <retval declared_type='NSDragOperation' type='I' type64='Q'/>
-    </method>
-    <method selector='browser:willDisplayCell:atRow:column:'>
-      <arg name='sender' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='cell' declared_type='id' type='@' index='1'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='browser:writeRowsWithIndexes:inColumn:toPasteboard:'>
-      <arg name='browser' declared_type='NSBrowser*' type='@' index='0'/>
-      <arg name='rowIndexes' declared_type='NSIndexSet*' type='@' index='1'/>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='browserColumnConfigurationDidChange:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='browserDidScroll:'>
-      <arg name='sender' declared_type='NSBrowser*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='browserWillScroll:'>
-      <arg name='sender' declared_type='NSBrowser*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='buttonToolTip'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='canBeDisabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cellBaselineOffset'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='cellFrameForTextContainer:proposedLineFragment:glyphPosition:characterIndex:'>
-      <arg name='textContainer' declared_type='NSTextContainer*' type='@' index='0'/>
-      <arg name='lineFrag' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='position' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='2'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='cellSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='changeColor:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='changeFont:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='changeSpelling:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='characterIndexForPoint:'>
-      <arg name='thePoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='characterIndexForPoint:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='comboBox:completedString:'>
-      <arg name='aComboBox' declared_type='NSComboBox*' type='@' index='0'/>
-      <arg name='string' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='comboBox:indexOfItemWithStringValue:'>
-      <arg name='aComboBox' declared_type='NSComboBox*' type='@' index='0'/>
-      <arg name='string' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='comboBox:objectValueForItemAtIndex:'>
-      <arg name='aComboBox' declared_type='NSComboBox*' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='comboBoxCell:completedString:'>
-      <arg name='aComboBoxCell' declared_type='NSComboBoxCell*' type='@' index='0'/>
-      <arg name='uncompletedString' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='comboBoxCell:indexOfItemWithStringValue:'>
-      <arg name='aComboBoxCell' declared_type='NSComboBoxCell*' type='@' index='0'/>
-      <arg name='string' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='comboBoxCell:objectValueForItemAtIndex:'>
-      <arg name='aComboBoxCell' declared_type='NSComboBoxCell*' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='comboBoxSelectionDidChange:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='comboBoxSelectionIsChanging:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='comboBoxWillDismiss:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='comboBoxWillPopUp:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='commitEditing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='commitEditingWithDelegate:didCommitSelector:contextInfo:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <arg name='didCommitSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='concludeDragOperation:'>
-      <arg name='sender' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='control:didFailToFormatString:errorDescription:'>
-      <arg name='control' declared_type='NSControl*' type='@' index='0'/>
-      <arg name='string' declared_type='NSString*' type='@' index='1'/>
-      <arg name='error' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='control:didFailToValidatePartialString:errorDescription:'>
-      <arg name='control' declared_type='NSControl*' type='@' index='0'/>
-      <arg name='string' declared_type='NSString*' type='@' index='1'/>
-      <arg name='error' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='control:isValidObject:'>
-      <arg name='control' declared_type='NSControl*' type='@' index='0'/>
-      <arg name='obj' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='control:textShouldBeginEditing:'>
-      <arg name='control' declared_type='NSControl*' type='@' index='0'/>
-      <arg name='fieldEditor' declared_type='NSText*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='control:textShouldEndEditing:'>
-      <arg name='control' declared_type='NSControl*' type='@' index='0'/>
-      <arg name='fieldEditor' declared_type='NSText*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='control:textView:completions:forPartialWordRange:indexOfSelectedItem:'>
-      <arg name='control' declared_type='NSControl*' type='@' index='0'/>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='1'/>
-      <arg name='words' declared_type='NSArray*' type='@' index='2'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <arg name='index' declared_type='NSInteger*' type='^i' type64='^q' index='4'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='control:textView:doCommandBySelector:'>
-      <arg name='control' declared_type='NSControl*' type='@' index='0'/>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='1'/>
-      <arg name='commandSelector' declared_type='SEL' type=':' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='controlTextDidBeginEditing:'>
-      <arg name='obj' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='controlTextDidChange:'>
-      <arg name='obj' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='controlTextDidEndEditing:'>
-      <arg name='obj' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='conversationIdentifier'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='currentMode'>
-      <retval declared_type='NSColorPanelMode' type='i' type64='q'/>
-    </method>
-    <method selector='datePickerCell:validateProposedDateValue:timeInterval:'>
-      <arg name='aDatePickerCell' declared_type='NSDatePickerCell*' type='@' index='0'/>
-      <arg name='proposedDateValue' declared_type='NSDate**' type='^@' index='1'/>
-      <arg name='proposedTimeInterval' declared_type='NSTimeInterval*' type='^d' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='defaultAnimationForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='defaultPlaceholderForMarker:withBinding:'>
-      <arg name='marker' declared_type='id' type='@' index='0'/>
-      <arg name='binding' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='detachColorList:'>
-      <arg name='colorList' declared_type='NSColorList*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='discardEditing'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='doCommandBySelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='doCommandBySelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='doCommandBySelector:client:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='sender' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='draggedImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='draggedImage:beganAt:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='screenPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='draggedImage:endedAt:deposited:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='screenPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='draggedImage:endedAt:operation:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='screenPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='operation' declared_type='NSDragOperation' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='draggedImage:movedTo:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='screenPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='draggedImageLocation'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='draggingDestinationWindow'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='draggingEnded:'>
-      <arg name='sender' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='draggingEntered:'>
-      <arg name='sender' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='0'/>
-      <retval declared_type='NSDragOperation' type='I' type64='Q'/>
-    </method>
-    <method selector='draggingExited:'>
-      <arg name='sender' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='draggingLocation'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='draggingPasteboard'>
-      <retval declared_type='NSPasteboard*' type='@'/>
-    </method>
-    <method selector='draggingSequenceNumber'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='draggingSource'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='draggingSourceOperationMask'>
-      <retval declared_type='NSDragOperation' type='I' type64='Q'/>
-    </method>
-    <method selector='draggingSourceOperationMaskForLocal:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='NSDragOperation' type='I' type64='Q'/>
-    </method>
-    <method selector='draggingUpdated:'>
-      <arg name='sender' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='0'/>
-      <retval declared_type='NSDragOperation' type='I' type64='Q'/>
-    </method>
-    <method selector='drawWithFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawWithFrame:inView:characterIndex:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawWithFrame:inView:characterIndex:layoutManager:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='layoutManager' declared_type='NSLayoutManager*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawerDidClose:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawerDidOpen:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawerShouldClose:'>
-      <arg name='sender' declared_type='NSDrawer*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='drawerShouldOpen:'>
-      <arg name='sender' declared_type='NSDrawer*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='drawerWillClose:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawerWillOpen:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawerWillResizeContents:toSize:'>
-      <arg name='sender' declared_type='NSDrawer*' type='@' index='0'/>
-      <arg name='contentSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='1'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method class_method='true' selector='exposeBinding:'>
-      <arg name='binding' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='exposedBindings'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='firstRectForCharacterRange:'>
-      <arg name='theRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='firstRectForCharacterRange:actualRange:'>
-      <arg name='aRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='actualRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='fontManager:willIncludeFont:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <arg name='fontName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fractionOfDistanceThroughGlyphForPoint:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='hasMarkedText'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasMarkedText'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='highlight:withFrame:inView:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='ignoreModifierKeysWhileDragging'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='ignoreSpelling:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='image:didLoadPartOfRepresentation:withValidRows:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='rep' declared_type='NSImageRep*' type='@' index='1'/>
-      <arg name='rows' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='image:didLoadRepresentation:withStatus:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='rep' declared_type='NSImageRep*' type='@' index='1'/>
-      <arg name='status' declared_type='NSImageLoadStatus' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='image:didLoadRepresentationHeader:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='rep' declared_type='NSImageRep*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='image:willLoadRepresentation:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='rep' declared_type='NSImageRep*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='imageDidNotDraw:inRect:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='infoForBinding:'>
-      <arg name='binding' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='initWithPickerMask:colorPanel:'>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='owningColorPanel' declared_type='NSColorPanel*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='inputClientBecomeActive:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='inputClientDisabled:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='inputClientEnabled:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='inputClientResignActive:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertGlyphs:length:forStartingGlyphAtIndex:characterIndex:'>
-      <arg name='glyphs' declared_type='NSGlyph*' type='^I' const='true' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertNewButtonImage:in:'>
-      <arg name='newButtonImage' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='buttonCell' declared_type='NSButtonCell*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertText:'>
-      <arg name='aString' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertText:client:'>
-      <arg name='aString' declared_type='id' type='@' index='0'/>
-      <arg name='sender' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertText:replacementRange:'>
-      <arg name='aString' declared_type='id' type='@' index='0'/>
-      <arg name='replacementRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isExplicitlyIncluded'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='key'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='keyPathsForValuesAffectingPreview'>
-      <retval declared_type='NSSet*' type='@'/>
-    </method>
-    <method selector='layoutManager:didCompleteLayoutForTextContainer:atEnd:'>
-      <arg name='layoutManager' declared_type='NSLayoutManager*' type='@' index='0'/>
-      <arg name='textContainer' declared_type='NSTextContainer*' type='@' index='1'/>
-      <arg name='layoutFinishedFlag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='layoutManager:shouldUseTemporaryAttributes:forDrawingToScreen:atCharacterIndex:effectiveRange:'>
-      <arg name='layoutManager' declared_type='NSLayoutManager*' type='@' index='0'/>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='toScreen' declared_type='BOOL' type='B' index='2'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <arg name='effectiveCharRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='4'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='layoutManagerDidInvalidateLayout:'>
-      <arg name='sender' declared_type='NSLayoutManager*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='layoutOptions'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='localizedKey'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='localizedSummaryItems'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='markedRange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='markedRange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='markedTextAbandoned:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='markedTextSelectionChanged:client:'>
-      <arg name='newSel' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='sender' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='menu:updateItem:atIndex:shouldCancel:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <arg name='item' declared_type='NSMenuItem*' type='@' index='1'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='shouldCancel' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='menu:willHighlightItem:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <arg name='item' declared_type='NSMenuItem*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='menuDidClose:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='menuHasKeyEquivalent:forEvent:target:action:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='1'/>
-      <arg name='target' declared_type='id*' type='^@' index='2'/>
-      <arg name='action' declared_type='SEL*' type='^:' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='menuNeedsUpdate:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='menuWillOpen:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='minContentSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='mouseDownOnCharacterIndex:atCoordinate:withModifier:client:'>
-      <arg name='theIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='thePoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='theFlags' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='sender' declared_type='id' type='@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='mouseDraggedOnCharacterIndex:atCoordinate:withModifier:client:'>
-      <arg name='theIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='thePoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='theFlags' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='sender' declared_type='id' type='@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='mouseUpOnCharacterIndex:atCoordinate:withModifier:client:'>
-      <arg name='theIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='thePoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='theFlags' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='sender' declared_type='id' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='namesOfPromisedFilesDroppedAtDestination:'>
-      <arg name='dropDestination' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='namesOfPromisedFilesDroppedAtDestination:'>
-      <arg name='dropDestination' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='numberOfItemsInComboBox:'>
-      <arg name='aComboBox' declared_type='NSComboBox*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='numberOfItemsInComboBoxCell:'>
-      <arg name='comboBoxCell' declared_type='NSComboBoxCell*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='numberOfItemsInMenu:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='numberOfRowsInTableView:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='objectDidBeginEditing:'>
-      <arg name='editor' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='objectDidEndEditing:'>
-      <arg name='editor' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='optionDescriptionsForBinding:'>
-      <arg name='aBinding' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='outlineView:acceptDrop:item:childIndex:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='info' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='1'/>
-      <arg name='item' declared_type='id' type='@' index='2'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='outlineView:child:ofItem:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='item' declared_type='id' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='outlineView:dataCellForTableColumn:item:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <arg name='item' declared_type='id' type='@' index='2'/>
-      <retval declared_type='NSCell*' type='@'/>
-    </method>
-    <method selector='outlineView:didClickTableColumn:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineView:didDragTableColumn:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineView:heightOfRowByItem:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='item' declared_type='id' type='@' index='1'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='outlineView:isGroupItem:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='item' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='outlineView:isItemExpandable:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='item' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='outlineView:itemForPersistentObject:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='object' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='outlineView:mouseDownInHeaderOfTableColumn:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineView:namesOfPromisedFilesDroppedAtDestination:forDraggedItems:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='dropDestination' declared_type='NSURL*' type='@' index='1'/>
-      <arg name='items' declared_type='NSArray*' type='@' index='2'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='outlineView:nextTypeSelectMatchFromItem:toItem:forString:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='startItem' declared_type='id' type='@' index='1'/>
-      <arg name='endItem' declared_type='id' type='@' index='2'/>
-      <arg name='searchString' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='outlineView:numberOfChildrenOfItem:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='item' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='outlineView:objectValueForTableColumn:byItem:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <arg name='item' declared_type='id' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='outlineView:persistentObjectForItem:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='item' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='outlineView:selectionIndexesForProposedSelection:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='proposedSelectionIndexes' declared_type='NSIndexSet*' type='@' index='1'/>
-      <retval declared_type='NSIndexSet*' type='@'/>
-    </method>
-    <method selector='outlineView:setObjectValue:forTableColumn:byItem:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='object' declared_type='id' type='@' index='1'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='2'/>
-      <arg name='item' declared_type='id' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineView:shouldCollapseItem:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='item' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='outlineView:shouldEditTableColumn:item:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <arg name='item' declared_type='id' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='outlineView:shouldExpandItem:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='item' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='outlineView:shouldSelectItem:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='item' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='outlineView:shouldSelectTableColumn:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='outlineView:shouldShowCellExpansionForTableColumn:item:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <arg name='item' declared_type='id' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='outlineView:shouldTrackCell:forTableColumn:item:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='cell' declared_type='NSCell*' type='@' index='1'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='2'/>
-      <arg name='item' declared_type='id' type='@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='outlineView:shouldTypeSelectForEvent:withCurrentSearchString:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='1'/>
-      <arg name='searchString' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='outlineView:sortDescriptorsDidChange:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='oldDescriptors' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineView:toolTipForCell:rect:tableColumn:item:mouseLocation:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='cell' declared_type='NSCell*' type='@' index='1'/>
-      <arg name='rect' declared_type='NSRectPointer' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='3'/>
-      <arg name='item' declared_type='id' type='@' index='4'/>
-      <arg name='mouseLocation' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='5'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='outlineView:typeSelectStringForTableColumn:item:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <arg name='item' declared_type='id' type='@' index='2'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='outlineView:validateDrop:proposedItem:proposedChildIndex:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='info' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='1'/>
-      <arg name='item' declared_type='id' type='@' index='2'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='NSDragOperation' type='I' type64='Q'/>
-    </method>
-    <method selector='outlineView:willDisplayCell:forTableColumn:item:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='cell' declared_type='id' type='@' index='1'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='2'/>
-      <arg name='item' declared_type='id' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineView:willDisplayOutlineCell:forTableColumn:item:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='cell' declared_type='id' type='@' index='1'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='2'/>
-      <arg name='item' declared_type='id' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineView:writeItems:toPasteboard:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <arg name='items' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='outlineViewColumnDidMove:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineViewColumnDidResize:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineViewItemDidCollapse:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineViewItemDidExpand:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineViewItemWillCollapse:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineViewItemWillExpand:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineViewSelectionDidChange:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outlineViewSelectionIsChanging:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='panel:compareFilename:with:caseSensitive:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <arg name='name1' declared_type='NSString*' type='@' index='1'/>
-      <arg name='name2' declared_type='NSString*' type='@' index='2'/>
-      <arg name='caseSensitive' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method selector='panel:directoryDidChange:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <arg name='path' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='panel:isValidFilename:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <arg name='filename' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='panel:shouldShowFilename:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <arg name='filename' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='panel:userEnteredFilename:confirmed:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <arg name='filename' declared_type='NSString*' type='@' index='1'/>
-      <arg name='okFlag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='panel:willExpand:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <arg name='expanding' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='panelSelectionDidChange:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pasteboard:provideDataForType:'>
-      <arg name='sender' declared_type='NSPasteboard*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pasteboardChangedOwner:'>
-      <arg name='sender' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pathCell:willDisplayOpenPanel:'>
-      <arg name='pathCell' declared_type='NSPathCell*' type='@' index='0'/>
-      <arg name='openPanel' declared_type='NSOpenPanel*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pathCell:willPopUpMenu:'>
-      <arg name='pathCell' declared_type='NSPathCell*' type='@' index='0'/>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pathControl:acceptDrop:'>
-      <arg name='pathControl' declared_type='NSPathControl*' type='@' index='0'/>
-      <arg name='info' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='pathControl:shouldDragPathComponentCell:withPasteboard:'>
-      <arg name='pathControl' declared_type='NSPathControl*' type='@' index='0'/>
-      <arg name='pathComponentCell' declared_type='NSPathComponentCell*' type='@' index='1'/>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='pathControl:validateDrop:'>
-      <arg name='pathControl' declared_type='NSPathControl*' type='@' index='0'/>
-      <arg name='info' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='1'/>
-      <retval declared_type='NSDragOperation' type='I' type64='Q'/>
-    </method>
-    <method selector='pathControl:willDisplayOpenPanel:'>
-      <arg name='pathControl' declared_type='NSPathControl*' type='@' index='0'/>
-      <arg name='openPanel' declared_type='NSOpenPanel*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pathControl:willPopUpMenu:'>
-      <arg name='pathControl' declared_type='NSPathControl*' type='@' index='0'/>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performDragOperation:'>
-      <arg name='sender' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='prepareForDragOperation:'>
-      <arg name='sender' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='provideNewButtonImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='provideNewView:'>
-      <arg name='initialRequest' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='readSelectionFromPasteboard:'>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='ruleEditor:child:forCriterion:withRowType:'>
-      <arg name='editor' declared_type='NSRuleEditor*' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='criterion' declared_type='id' type='@' index='2'/>
-      <arg name='rowType' declared_type='NSRuleEditorRowType' type='I' type64='Q' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='ruleEditor:displayValueForCriterion:inRow:'>
-      <arg name='editor' declared_type='NSRuleEditor*' type='@' index='0'/>
-      <arg name='criterion' declared_type='id' type='@' index='1'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='ruleEditor:numberOfChildrenForCriterion:withRowType:'>
-      <arg name='editor' declared_type='NSRuleEditor*' type='@' index='0'/>
-      <arg name='criterion' declared_type='id' type='@' index='1'/>
-      <arg name='rowType' declared_type='NSRuleEditorRowType' type='I' type64='Q' index='2'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='ruleEditor:predicatePartsForCriterion:withDisplayValue:inRow:'>
-      <arg name='editor' declared_type='NSRuleEditor*' type='@' index='0'/>
-      <arg name='criterion' declared_type='id' type='@' index='1'/>
-      <arg name='value' declared_type='id' type='@' index='2'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='ruleEditorRowsDidChange:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedRange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='selectedRange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='selectionShouldChangeInOutlineView:'>
-      <arg name='outlineView' declared_type='NSOutlineView*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectionShouldChangeInTableView:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAnimations:'>
-      <arg name='dict' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttachment:'>
-      <arg name='anObject' declared_type='NSTextAttachment*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setColor:'>
-      <arg name='newColor' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setDefaultPlaceholder:forMarker:withBinding:'>
-      <arg name='placeholder' declared_type='id' type='@' index='0'/>
-      <arg name='marker' declared_type='id' type='@' index='1'/>
-      <arg name='binding' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIntAttribute:value:forGlyphAtIndex:'>
-      <arg name='attributeTag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='val' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocalizedKey:'>
-      <arg name='localizedKey' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMarkedText:selectedRange:'>
-      <arg name='aString' declared_type='id' type='@' index='0'/>
-      <arg name='selRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMarkedText:selectedRange:replacementRange:'>
-      <arg name='aString' declared_type='id' type='@' index='0'/>
-      <arg name='selectedRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='replacementRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMode:'>
-      <arg name='mode' declared_type='NSColorPanelMode' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValue:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='slideDraggedImageTo:'>
-      <arg name='screenPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sound:didFinishPlaying:'>
-      <arg name='sound' declared_type='NSSound*' type='@' index='0'/>
-      <arg name='aBool' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='speechRecognizer:didRecognizeCommand:'>
-      <arg name='sender' declared_type='NSSpeechRecognizer*' type='@' index='0'/>
-      <arg name='command' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='speechSynthesizer:didEncounterErrorAtIndex:ofString:message:'>
-      <arg name='sender' declared_type='NSSpeechSynthesizer*' type='@' index='0'/>
-      <arg name='characterIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='string' declared_type='NSString*' type='@' index='2'/>
-      <arg name='message' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='speechSynthesizer:didEncounterSyncMessage:'>
-      <arg name='sender' declared_type='NSSpeechSynthesizer*' type='@' index='0'/>
-      <arg name='message' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='speechSynthesizer:didFinishSpeaking:'>
-      <arg name='sender' declared_type='NSSpeechSynthesizer*' type='@' index='0'/>
-      <arg name='finishedSpeaking' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='speechSynthesizer:willSpeakPhoneme:'>
-      <arg name='sender' declared_type='NSSpeechSynthesizer*' type='@' index='0'/>
-      <arg name='phonemeOpcode' declared_type='short' type='s' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='speechSynthesizer:willSpeakWord:ofString:'>
-      <arg name='sender' declared_type='NSSpeechSynthesizer*' type='@' index='0'/>
-      <arg name='characterRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='string' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='splitView:additionalEffectiveRectOfDividerAtIndex:'>
-      <arg name='splitView' declared_type='NSSplitView*' type='@' index='0'/>
-      <arg name='dividerIndex' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='splitView:canCollapseSubview:'>
-      <arg name='splitView' declared_type='NSSplitView*' type='@' index='0'/>
-      <arg name='subview' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='splitView:constrainMaxCoordinate:ofSubviewAt:'>
-      <arg name='splitView' declared_type='NSSplitView*' type='@' index='0'/>
-      <arg name='proposedMaximumPosition' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='dividerIndex' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='splitView:constrainMinCoordinate:ofSubviewAt:'>
-      <arg name='splitView' declared_type='NSSplitView*' type='@' index='0'/>
-      <arg name='proposedMinimumPosition' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='dividerIndex' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='splitView:constrainSplitPosition:ofSubviewAt:'>
-      <arg name='splitView' declared_type='NSSplitView*' type='@' index='0'/>
-      <arg name='proposedPosition' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='dividerIndex' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:'>
-      <arg name='splitView' declared_type='NSSplitView*' type='@' index='0'/>
-      <arg name='proposedEffectiveRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='drawnRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='dividerIndex' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='splitView:resizeSubviewsWithOldSize:'>
-      <arg name='splitView' declared_type='NSSplitView*' type='@' index='0'/>
-      <arg name='oldSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:'>
-      <arg name='splitView' declared_type='NSSplitView*' type='@' index='0'/>
-      <arg name='subview' declared_type='NSView*' type='@' index='1'/>
-      <arg name='dividerIndex' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='splitView:shouldHideDividerAtIndex:'>
-      <arg name='splitView' declared_type='NSSplitView*' type='@' index='0'/>
-      <arg name='dividerIndex' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='splitViewDidResizeSubviews:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='splitViewWillResizeSubviews:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='supportsMode:'>
-      <arg name='mode' declared_type='NSColorPanelMode' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tabView:didSelectTabViewItem:'>
-      <arg name='tabView' declared_type='NSTabView*' type='@' index='0'/>
-      <arg name='tabViewItem' declared_type='NSTabViewItem*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tabView:shouldSelectTabViewItem:'>
-      <arg name='tabView' declared_type='NSTabView*' type='@' index='0'/>
-      <arg name='tabViewItem' declared_type='NSTabViewItem*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tabView:willSelectTabViewItem:'>
-      <arg name='tabView' declared_type='NSTabView*' type='@' index='0'/>
-      <arg name='tabViewItem' declared_type='NSTabViewItem*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tabViewDidChangeNumberOfTabViewItems:'>
-      <arg name='TabView' declared_type='NSTabView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tableView:acceptDrop:row:dropOperation:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='info' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='1'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='dropOperation' declared_type='NSTableViewDropOperation' type='I' type64='Q' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tableView:dataCellForTableColumn:row:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='NSCell*' type='@'/>
-    </method>
-    <method selector='tableView:didClickTableColumn:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tableView:didDragTableColumn:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tableView:heightOfRow:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='tableView:isGroupRow:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tableView:mouseDownInHeaderOfTableColumn:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tableView:namesOfPromisedFilesDroppedAtDestination:forDraggedRowsWithIndexes:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='dropDestination' declared_type='NSURL*' type='@' index='1'/>
-      <arg name='indexSet' declared_type='NSIndexSet*' type='@' index='2'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='tableView:nextTypeSelectMatchFromRow:toRow:forString:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='startRow' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='endRow' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='searchString' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='tableView:objectValueForTableColumn:row:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='tableView:selectionIndexesForProposedSelection:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='proposedSelectionIndexes' declared_type='NSIndexSet*' type='@' index='1'/>
-      <retval declared_type='NSIndexSet*' type='@'/>
-    </method>
-    <method selector='tableView:setObjectValue:forTableColumn:row:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='object' declared_type='id' type='@' index='1'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='2'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tableView:shouldEditTableColumn:row:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tableView:shouldSelectRow:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tableView:shouldSelectTableColumn:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tableView:shouldShowCellExpansionForTableColumn:row:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tableView:shouldTrackCell:forTableColumn:row:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='cell' declared_type='NSCell*' type='@' index='1'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='2'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tableView:shouldTypeSelectForEvent:withCurrentSearchString:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='1'/>
-      <arg name='searchString' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tableView:sortDescriptorsDidChange:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='oldDescriptors' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tableView:toolTipForCell:rect:tableColumn:row:mouseLocation:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='cell' declared_type='NSCell*' type='@' index='1'/>
-      <arg name='rect' declared_type='NSRectPointer' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='3'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <arg name='mouseLocation' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='5'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='tableView:typeSelectStringForTableColumn:row:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='1'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='tableView:validateDrop:proposedRow:proposedDropOperation:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='info' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='1'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='dropOperation' declared_type='NSTableViewDropOperation' type='I' type64='Q' index='3'/>
-      <retval declared_type='NSDragOperation' type='I' type64='Q'/>
-    </method>
-    <method selector='tableView:willDisplayCell:forTableColumn:row:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='cell' declared_type='id' type='@' index='1'/>
-      <arg name='tableColumn' declared_type='NSTableColumn*' type='@' index='2'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tableView:writeRows:toPasteboard:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='rows' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tableView:writeRowsWithIndexes:toPasteboard:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <arg name='rowIndexes' declared_type='NSIndexSet*' type='@' index='1'/>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tableViewColumnDidMove:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tableViewColumnDidResize:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tableViewSelectionDidChange:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tableViewSelectionIsChanging:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tag'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='terminate:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textDidBeginEditing:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textDidChange:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textDidEndEditing:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textShouldBeginEditing:'>
-      <arg name='textObject' declared_type='NSText*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='textShouldEndEditing:'>
-      <arg name='textObject' declared_type='NSText*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='textStorageDidProcessEditing:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textStorageWillProcessEditing:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textView:clickedOnCell:inRect:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='cell' declared_type='id &lt;NSTextAttachmentCell&gt;' type='@' index='1'/>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textView:clickedOnCell:inRect:atIndex:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='cell' declared_type='id &lt;NSTextAttachmentCell&gt;' type='@' index='1'/>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textView:clickedOnLink:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='link' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='textView:clickedOnLink:atIndex:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='link' declared_type='id' type='@' index='1'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='textView:completions:forPartialWordRange:indexOfSelectedItem:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='words' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <arg name='index' declared_type='NSInteger*' type='^i' type64='^q' index='3'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='textView:doCommandBySelector:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='commandSelector' declared_type='SEL' type=':' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='textView:doubleClickedOnCell:inRect:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='cell' declared_type='id &lt;NSTextAttachmentCell&gt;' type='@' index='1'/>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textView:doubleClickedOnCell:inRect:atIndex:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='cell' declared_type='id &lt;NSTextAttachmentCell&gt;' type='@' index='1'/>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textView:draggedCell:inRect:event:'>
-      <arg name='view' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='cell' declared_type='id &lt;NSTextAttachmentCell&gt;' type='@' index='1'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textView:draggedCell:inRect:event:atIndex:'>
-      <arg name='view' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='cell' declared_type='id &lt;NSTextAttachmentCell&gt;' type='@' index='1'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='3'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textView:menu:forEvent:atIndex:'>
-      <arg name='view' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='1'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='2'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='textView:shouldChangeTextInRange:replacementString:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='affectedCharRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='replacementString' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='textView:shouldChangeTextInRanges:replacementStrings:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='affectedRanges' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='replacementStrings' declared_type='NSArray*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='textView:shouldChangeTypingAttributes:toAttributes:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='oldTypingAttributes' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='newTypingAttributes' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='textView:shouldSetSpellingState:range:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='value' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='affectedCharRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='textView:willChangeSelectionFromCharacterRange:toCharacterRange:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='oldSelectedCharRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='newSelectedCharRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='textView:willChangeSelectionFromCharacterRanges:toCharacterRanges:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='oldSelectedCharRanges' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='newSelectedCharRanges' declared_type='NSArray*' type='@' index='2'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='textView:willDisplayToolTip:forCharacterAtIndex:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='tooltip' declared_type='NSString*' type='@' index='1'/>
-      <arg name='characterIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='textView:writablePasteboardTypesForCell:atIndex:'>
-      <arg name='view' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='cell' declared_type='id &lt;NSTextAttachmentCell&gt;' type='@' index='1'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='textView:writeCell:atIndex:toPasteboard:type:'>
-      <arg name='view' declared_type='NSTextView*' type='@' index='0'/>
-      <arg name='cell' declared_type='id &lt;NSTextAttachmentCell&gt;' type='@' index='1'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='3'/>
-      <arg name='type' declared_type='NSString*' type='@' index='4'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='textViewDidChangeSelection:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textViewDidChangeTypingAttributes:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tokenField:completionsForSubstring:indexOfToken:indexOfSelectedItem:'>
-      <arg name='tokenField' declared_type='NSTokenField*' type='@' index='0'/>
-      <arg name='substring' declared_type='NSString*' type='@' index='1'/>
-      <arg name='tokenIndex' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='selectedIndex' declared_type='NSInteger*' type='^i' type64='^q' index='3'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='tokenField:displayStringForRepresentedObject:'>
-      <arg name='tokenField' declared_type='NSTokenField*' type='@' index='0'/>
-      <arg name='representedObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='tokenField:editingStringForRepresentedObject:'>
-      <arg name='tokenField' declared_type='NSTokenField*' type='@' index='0'/>
-      <arg name='representedObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='tokenField:hasMenuForRepresentedObject:'>
-      <arg name='tokenField' declared_type='NSTokenField*' type='@' index='0'/>
-      <arg name='representedObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tokenField:menuForRepresentedObject:'>
-      <arg name='tokenField' declared_type='NSTokenField*' type='@' index='0'/>
-      <arg name='representedObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='tokenField:readFromPasteboard:'>
-      <arg name='tokenField' declared_type='NSTokenField*' type='@' index='0'/>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='tokenField:representedObjectForEditingString:'>
-      <arg name='tokenField' declared_type='NSTokenField*' type='@' index='0'/>
-      <arg name='editingString' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='tokenField:shouldAddObjects:atIndex:'>
-      <arg name='tokenField' declared_type='NSTokenField*' type='@' index='0'/>
-      <arg name='tokens' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='tokenField:styleForRepresentedObject:'>
-      <arg name='tokenField' declared_type='NSTokenField*' type='@' index='0'/>
-      <arg name='representedObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSTokenStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='tokenField:writeRepresentedObjects:toPasteboard:'>
-      <arg name='tokenField' declared_type='NSTokenField*' type='@' index='0'/>
-      <arg name='objects' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tokenFieldCell:completionsForSubstring:indexOfToken:indexOfSelectedItem:'>
-      <arg name='tokenFieldCell' declared_type='NSTokenFieldCell*' type='@' index='0'/>
-      <arg name='substring' declared_type='NSString*' type='@' index='1'/>
-      <arg name='tokenIndex' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='selectedIndex' declared_type='NSInteger*' type='^i' type64='^q' index='3'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='tokenFieldCell:displayStringForRepresentedObject:'>
-      <arg name='tokenFieldCell' declared_type='NSTokenFieldCell*' type='@' index='0'/>
-      <arg name='representedObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='tokenFieldCell:editingStringForRepresentedObject:'>
-      <arg name='tokenFieldCell' declared_type='NSTokenFieldCell*' type='@' index='0'/>
-      <arg name='representedObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='tokenFieldCell:hasMenuForRepresentedObject:'>
-      <arg name='tokenFieldCell' declared_type='NSTokenFieldCell*' type='@' index='0'/>
-      <arg name='representedObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tokenFieldCell:menuForRepresentedObject:'>
-      <arg name='tokenFieldCell' declared_type='NSTokenFieldCell*' type='@' index='0'/>
-      <arg name='representedObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='tokenFieldCell:readFromPasteboard:'>
-      <arg name='tokenFieldCell' declared_type='NSTokenFieldCell*' type='@' index='0'/>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='tokenFieldCell:representedObjectForEditingString:'>
-      <arg name='tokenFieldCell' declared_type='NSTokenFieldCell*' type='@' index='0'/>
-      <arg name='editingString' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='tokenFieldCell:shouldAddObjects:atIndex:'>
-      <arg name='tokenFieldCell' declared_type='NSTokenFieldCell*' type='@' index='0'/>
-      <arg name='tokens' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='tokenFieldCell:styleForRepresentedObject:'>
-      <arg name='tokenFieldCell' declared_type='NSTokenFieldCell*' type='@' index='0'/>
-      <arg name='representedObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSTokenStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='tokenFieldCell:writeRepresentedObjects:toPasteboard:'>
-      <arg name='tokenFieldCell' declared_type='NSTokenFieldCell*' type='@' index='0'/>
-      <arg name='objects' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:'>
-      <arg name='toolbar' declared_type='NSToolbar*' type='@' index='0'/>
-      <arg name='itemIdentifier' declared_type='NSString*' type='@' index='1'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='NSToolbarItem*' type='@'/>
-    </method>
-    <method selector='toolbarAllowedItemIdentifiers:'>
-      <arg name='toolbar' declared_type='NSToolbar*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='toolbarDefaultItemIdentifiers:'>
-      <arg name='toolbar' declared_type='NSToolbar*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='toolbarDidRemoveItem:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toolbarSelectableItemIdentifiers:'>
-      <arg name='toolbar' declared_type='NSToolbar*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='toolbarWillAddItem:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='trackMouse:inRect:ofView:atCharacterIndex:untilMouseUp:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='4'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='trackMouse:inRect:ofView:untilMouseUp:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='unbind:'>
-      <arg name='binding' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='undoManagerForTextView:'>
-      <arg name='view' declared_type='NSTextView*' type='@' index='0'/>
-      <retval declared_type='NSUndoManager*' type='@'/>
-    </method>
-    <method selector='unmarkText'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='unmarkText'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='validAttributesForMarkedText'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='validAttributesForMarkedText'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='validModesForFontPanel:'>
-      <arg name='fontPanel' declared_type='NSFontPanel*' type='@' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='validateMenuItem:'>
-      <arg name='menuItem' declared_type='NSMenuItem*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='validateToolbarItem:'>
-      <arg name='theItem' declared_type='NSToolbarItem*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='validateUserInterfaceItem:'>
-      <arg name='anItem' declared_type='id &lt;NSValidatedUserInterfaceItem&gt;' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='value'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='valueClassForBinding:'>
-      <arg name='binding' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='view:stringForToolTip:point:userData:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <arg name='tag' declared_type='NSToolTipTag' type='i' type64='q' index='1'/>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='2'/>
-      <arg name='data' declared_type='void*' type='^v' index='3'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='viewSizeChanged:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='wantsPeriodicDraggingUpdates'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='wantsToDelayTextChangeNotifications'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='wantsToHandleMouseEvents'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='wantsToInterpretAllKeystrokes'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='wantsToTrackMouse'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='wantsToTrackMouseForEvent:inRect:ofView:atCharacterIndex:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='window:shouldDragDocumentWithEvent:from:withPasteboard:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='1'/>
-      <arg name='dragImageLocation' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='2'/>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='window:shouldPopUpDocumentPathMenu:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='window:willPositionSheet:usingRect:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='sheet' declared_type='NSWindow*' type='@' index='1'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='windowDidBecomeKey:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowDidBecomeMain:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowDidChangeScreen:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowDidChangeScreenProfile:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowDidDeminiaturize:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowDidEndSheet:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowDidExpose:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowDidMiniaturize:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowDidMove:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowDidResignKey:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowDidResignMain:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowDidResize:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowDidUpdate:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowLevel'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='windowShouldClose:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='windowShouldZoom:toFrame:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='newFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='windowWillBeginSheet:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowWillClose:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowWillMiniaturize:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowWillMove:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowWillResize:toSize:'>
-      <arg name='sender' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='frameSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='1'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='windowWillReturnFieldEditor:toObject:'>
-      <arg name='sender' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='client' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='windowWillReturnUndoManager:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='NSUndoManager*' type='@'/>
-    </method>
-    <method selector='windowWillUseStandardFrame:defaultFrame:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='newFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='writeSelectionToPasteboard:types:'>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <arg name='types' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSObjectController'>
-    <method selector='add:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='automaticallyPreparesContent'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canAdd'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canRemove'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='content'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='defaultFetchRequest'>
-      <retval declared_type='NSFetchRequest*' type='@'/>
-    </method>
-    <method selector='entityName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fetch:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='fetchPredicate'>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method selector='fetchWithRequest:merge:error:'>
-      <arg name='fetchRequest' declared_type='NSFetchRequest*' type='@' index='0'/>
-      <arg name='merge' declared_type='BOOL' type='B' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initWithContent:'>
-      <arg name='content' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isEditable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='managedObjectContext'>
-      <retval declared_type='NSManagedObjectContext*' type='@'/>
-    </method>
-    <method selector='newObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectClass'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='prepareContent'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='remove:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedObjects'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='selection'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setAutomaticallyPreparesContent:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContent:'>
-      <arg name='content' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEditable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEntityName:'>
-      <arg name='entityName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFetchPredicate:'>
-      <arg name='predicate' declared_type='NSPredicate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setManagedObjectContext:'>
-      <arg name='managedObjectContext' declared_type='NSManagedObjectContext*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObjectClass:'>
-      <arg name='objectClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesLazyFetching:'>
-      <arg name='enabled' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='usesLazyFetching'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='validateUserInterfaceItem:'>
-      <arg name='item' declared_type='id &lt;NSValidatedUserInterfaceItem&gt;' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSOpenGLContext'>
-    <method selector='CGLContextObj'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method class_method='true' selector='clearCurrentContext'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='clearDrawable'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='copyAttributesFromContext:withMask:'>
-      <arg name='context' declared_type='NSOpenGLContext*' type='@' index='0'/>
-      <arg name='mask' declared_type='GLbitfield' type='I' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='createTexture:fromView:internalFormat:'>
-      <arg name='target' declared_type='GLenum' type='I' index='0'/>
-      <arg name='view' declared_type='NSView*' type='@' index='1'/>
-      <arg name='format' declared_type='GLenum' type='I' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='currentContext'>
-      <retval declared_type='NSOpenGLContext*' type='@'/>
-    </method>
-    <method selector='currentVirtualScreen'>
-      <retval declared_type='GLint' type='i'/>
-    </method>
-    <method selector='flushBuffer'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getValues:forParameter:'>
-      <arg name='vals' declared_type='GLint*' type='^i' index='0'/>
-      <arg name='param' declared_type='NSOpenGLContextParameter' type='i' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithFormat:shareContext:'>
-      <arg name='format' declared_type='NSOpenGLPixelFormat*' type='@' index='0'/>
-      <arg name='share' declared_type='NSOpenGLContext*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='makeCurrentContext'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pixelBuffer'>
-      <retval declared_type='NSOpenGLPixelBuffer*' type='@'/>
-    </method>
-    <method selector='pixelBufferCubeMapFace'>
-      <retval declared_type='GLenum' type='I'/>
-    </method>
-    <method selector='pixelBufferMipMapLevel'>
-      <retval declared_type='GLint' type='i'/>
-    </method>
-    <method selector='setCurrentVirtualScreen:'>
-      <arg name='screen' declared_type='GLint' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFullScreen'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOffScreen:width:height:rowbytes:'>
-      <arg name='baseaddr' declared_type='void*' type='^v' index='0'/>
-      <arg name='width' declared_type='GLsizei' type='i' index='1'/>
-      <arg name='height' declared_type='GLsizei' type='i' index='2'/>
-      <arg name='rowbytes' declared_type='GLint' type='i' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPixelBuffer:cubeMapFace:mipMapLevel:currentVirtualScreen:'>
-      <arg name='pixelBuffer' declared_type='NSOpenGLPixelBuffer*' type='@' index='0'/>
-      <arg name='face' declared_type='GLenum' type='I' index='1'/>
-      <arg name='level' declared_type='GLint' type='i' index='2'/>
-      <arg name='screen' declared_type='GLint' type='i' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextureImageToPixelBuffer:colorBuffer:'>
-      <arg name='pixelBuffer' declared_type='NSOpenGLPixelBuffer*' type='@' index='0'/>
-      <arg name='source' declared_type='GLenum' type='I' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValues:forParameter:'>
-      <arg name='vals' declared_type='GLint*' type='^i' const='true' index='0'/>
-      <arg name='param' declared_type='NSOpenGLContextParameter' type='i' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='update'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='view'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-  </class>
-  <class name='NSOpenGLPixelBuffer'>
-    <method selector='initWithTextureTarget:textureInternalFormat:textureMaxMipMapLevel:pixelsWide:pixelsHigh:'>
-      <arg name='target' declared_type='GLenum' type='I' index='0'/>
-      <arg name='format' declared_type='GLenum' type='I' index='1'/>
-      <arg name='maxLevel' declared_type='GLint' type='i' index='2'/>
-      <arg name='pixelsWide' declared_type='GLsizei' type='i' index='3'/>
-      <arg name='pixelsHigh' declared_type='GLsizei' type='i' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='pixelsHigh'>
-      <retval declared_type='GLsizei' type='i'/>
-    </method>
-    <method selector='pixelsWide'>
-      <retval declared_type='GLsizei' type='i'/>
-    </method>
-    <method selector='textureInternalFormat'>
-      <retval declared_type='GLenum' type='I'/>
-    </method>
-    <method selector='textureMaxMipMapLevel'>
-      <retval declared_type='GLint' type='i'/>
-    </method>
-    <method selector='textureTarget'>
-      <retval declared_type='GLenum' type='I'/>
-    </method>
-  </class>
-  <class name='NSOpenGLPixelFormat'>
-    <method selector='CGLPixelFormatObj'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='attributes'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='getValues:forAttribute:forVirtualScreen:'>
-      <arg name='vals' declared_type='GLint*' type='^i' index='0'/>
-      <arg name='attrib' declared_type='NSOpenGLPixelFormatAttribute' type='I' index='1'/>
-      <arg name='screen' declared_type='GLint' type='i' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithAttributes:'>
-      <arg name='attribs' declared_type='NSOpenGLPixelFormatAttribute*' type='^I' const='true' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:'>
-      <arg name='attribs' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='numberOfVirtualScreens'>
-      <retval declared_type='GLint' type='i'/>
-    </method>
-    <method selector='setAttributes:'>
-      <arg name='attribs' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSOpenGLView'>
-    <method selector='clearGLContext'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='defaultPixelFormat'>
-      <retval declared_type='NSOpenGLPixelFormat*' type='@'/>
-    </method>
-    <method selector='initWithFrame:pixelFormat:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='format' declared_type='NSOpenGLPixelFormat*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='openGLContext'>
-      <retval declared_type='NSOpenGLContext*' type='@'/>
-    </method>
-    <method selector='pixelFormat'>
-      <retval declared_type='NSOpenGLPixelFormat*' type='@'/>
-    </method>
-    <method selector='prepareOpenGL'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='reshape'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOpenGLContext:'>
-      <arg name='context' declared_type='NSOpenGLContext*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPixelFormat:'>
-      <arg name='pixelFormat' declared_type='NSOpenGLPixelFormat*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='update'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSOpenPanel'>
-    <method selector='URLs'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='allowsMultipleSelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='beginForDirectory:file:types:modelessDelegate:didEndSelector:contextInfo:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <arg name='fileTypes' declared_type='NSArray*' type='@' index='2'/>
-      <arg name='delegate' declared_type='id' type='@' index='3'/>
-      <arg name='didEndSelector' declared_type='SEL' type=':' index='4'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='5'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='beginSheetForDirectory:file:types:modalForWindow:modalDelegate:didEndSelector:contextInfo:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <arg name='fileTypes' declared_type='NSArray*' type='@' index='2'/>
-      <arg name='docWindow' declared_type='NSWindow*' type='@' index='3'/>
-      <arg name='delegate' declared_type='id' type='@' index='4'/>
-      <arg name='didEndSelector' declared_type='SEL' type=':' index='5'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='6'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='canChooseDirectories'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canChooseFiles'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='filenames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='openPanel'>
-      <retval declared_type='NSOpenPanel*' type='@'/>
-    </method>
-    <method selector='resolvesAliases'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='runModalForDirectory:file:types:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <arg name='fileTypes' declared_type='NSArray*' type='@' index='2'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='runModalForTypes:'>
-      <arg name='fileTypes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setAllowsMultipleSelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCanChooseDirectories:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCanChooseFiles:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setResolvesAliases:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSOutlineView'>
-    <method selector='autoresizesOutlineColumn'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='autosaveExpandedItems'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='collapseItem:'>
-      <arg name='item' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='collapseItem:collapseChildren:'>
-      <arg name='item' declared_type='id' type='@' index='0'/>
-      <arg name='collapseChildren' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='expandItem:'>
-      <arg name='item' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='expandItem:expandChildren:'>
-      <arg name='item' declared_type='id' type='@' index='0'/>
-      <arg name='expandChildren' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='frameOfOutlineCellAtRow:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='indentationMarkerFollowsCell'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='indentationPerLevel'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='isExpandable:'>
-      <arg name='item' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isItemExpanded:'>
-      <arg name='item' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='itemAtRow:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='levelForItem:'>
-      <arg name='item' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='levelForRow:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='outlineTableColumn'>
-      <retval declared_type='NSTableColumn*' type='@'/>
-    </method>
-    <method selector='parentForItem:'>
-      <arg name='item' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='reloadItem:'>
-      <arg name='item' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='reloadItem:reloadChildren:'>
-      <arg name='item' declared_type='id' type='@' index='0'/>
-      <arg name='reloadChildren' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rowForItem:'>
-      <arg name='item' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setAutoresizesOutlineColumn:'>
-      <arg name='resize' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutosaveExpandedItems:'>
-      <arg name='save' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDropItem:dropChildIndex:'>
-      <arg name='item' declared_type='id' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIndentationMarkerFollowsCell:'>
-      <arg name='drawInCell' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIndentationPerLevel:'>
-      <arg name='indentationPerLevel' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOutlineTableColumn:'>
-      <arg name='outlineTableColumn' declared_type='NSTableColumn*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shouldCollapseAutoExpandedItemsForDeposited:'>
-      <arg name='deposited' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSPDFImageRep'>
-    <method selector='PDFRepresentation'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='bounds'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='currentPage'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='imageRepWithData:'>
-      <arg name='pdfData' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:'>
-      <arg name='pdfData' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='pageCount'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setCurrentPage:'>
-      <arg name='page' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSPICTImageRep'>
-    <method selector='PICTRepresentation'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='boundingBox'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method class_method='true' selector='imageRepWithData:'>
-      <arg name='pictData' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:'>
-      <arg name='pictData' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSPageLayout'>
-    <method selector='accessoryControllers'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='accessoryView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='addAccessoryController:'>
-      <arg name='accessoryController' declared_type='NSViewController*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='beginSheetWithPrintInfo:modalForWindow:delegate:didEndSelector:contextInfo:'>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='0'/>
-      <arg name='docWindow' declared_type='NSWindow*' type='@' index='1'/>
-      <arg name='delegate' declared_type='id' type='@' index='2'/>
-      <arg name='didEndSelector' declared_type='SEL' type=':' index='3'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='pageLayout'>
-      <retval declared_type='NSPageLayout*' type='@'/>
-    </method>
-    <method selector='printInfo'>
-      <retval declared_type='NSPrintInfo*' type='@'/>
-    </method>
-    <method selector='readPrintInfo'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAccessoryController:'>
-      <arg name='accessoryController' declared_type='NSViewController*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='runModal'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='runModalWithPrintInfo:'>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setAccessoryView:'>
-      <arg name='accessoryView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='writePrintInfo'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSPanel'>
-    <method selector='becomesKeyOnlyIfNeeded'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isFloatingPanel'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setBecomesKeyOnlyIfNeeded:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFloatingPanel:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWorksWhenModal:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='worksWhenModal'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSParagraphStyle'>
-    <method selector='alignment'>
-      <retval declared_type='NSTextAlignment' type='I' type64='Q'/>
-    </method>
-    <method selector='baseWritingDirection'>
-      <retval declared_type='NSWritingDirection' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='defaultParagraphStyle'>
-      <retval declared_type='NSParagraphStyle*' type='@'/>
-    </method>
-    <method selector='defaultTabInterval'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='defaultWritingDirectionForLanguage:'>
-      <arg name='languageName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSWritingDirection' type='i' type64='q'/>
-    </method>
-    <method selector='firstLineHeadIndent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='headIndent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='headerLevel'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='hyphenationFactor'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='lineBreakMode'>
-      <retval declared_type='NSLineBreakMode' type='I' type64='Q'/>
-    </method>
-    <method selector='lineHeightMultiple'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='lineSpacing'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='maximumLineHeight'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='minimumLineHeight'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='paragraphSpacing'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='paragraphSpacingBefore'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='tabStops'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='tailIndent'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='textBlocks'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='textLists'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='tighteningFactorForTruncation'>
-      <retval declared_type='float' type='f'/>
-    </method>
-  </class>
-  <class name='NSPasteboard'>
-    <method selector='addTypes:owner:'>
-      <arg name='newTypes' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='newOwner' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='availableTypeFromArray:'>
-      <arg name='types' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='changeCount'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='dataForType:'>
-      <arg name='dataType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='declareTypes:owner:'>
-      <arg name='newTypes' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='newOwner' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='generalPasteboard'>
-      <retval declared_type='NSPasteboard*' type='@'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='pasteboardByFilteringData:ofType:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSPasteboard*' type='@'/>
-    </method>
-    <method class_method='true' selector='pasteboardByFilteringFile:'>
-      <arg name='filename' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSPasteboard*' type='@'/>
-    </method>
-    <method class_method='true' selector='pasteboardByFilteringTypesInPasteboard:'>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='NSPasteboard*' type='@'/>
-    </method>
-    <method class_method='true' selector='pasteboardWithName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSPasteboard*' type='@'/>
-    </method>
-    <method class_method='true' selector='pasteboardWithUniqueName'>
-      <retval declared_type='NSPasteboard*' type='@'/>
-    </method>
-    <method selector='propertyListForType:'>
-      <arg name='dataType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='readFileContentsType:toFile:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <arg name='filename' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='readFileWrapper'>
-      <retval declared_type='NSFileWrapper*' type='@'/>
-    </method>
-    <method selector='releaseGlobally'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setData:forType:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='dataType' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setPropertyList:forType:'>
-      <arg name='plist' declared_type='id' type='@' index='0'/>
-      <arg name='dataType' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setString:forType:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='dataType' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='stringForType:'>
-      <arg name='dataType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='types'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='typesFilterableTo:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='writeFileContents:'>
-      <arg name='filename' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeFileWrapper:'>
-      <arg name='wrapper' declared_type='NSFileWrapper*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSPathCell'>
-    <method selector='URL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='allowedTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='clickedPathComponentCell'>
-      <retval declared_type='NSPathComponentCell*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='doubleAction'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='mouseEntered:withFrame:inView:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='view' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='mouseExited:withFrame:inView:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='view' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pathComponentCellAtPoint:withFrame:inView:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='view' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='NSPathComponentCell*' type='@'/>
-    </method>
-    <method class_method='true' selector='pathComponentCellClass'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='pathComponentCells'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='pathStyle'>
-      <retval declared_type='NSPathStyle' type='i' type64='q'/>
-    </method>
-    <method selector='placeholderAttributedString'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='placeholderString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='rectOfPathComponentCell:withFrame:inView:'>
-      <arg name='cell' declared_type='NSPathComponentCell*' type='@' index='0'/>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='view' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='setAllowedTypes:'>
-      <arg name='allowedTypes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setControlSize:'>
-      <arg name='size' declared_type='NSControlSize' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDoubleAction:'>
-      <arg name='action' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObjectValue:'>
-      <arg name='obj' declared_type='id &lt;NSCopying&gt;' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPathComponentCells:'>
-      <arg name='cells' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPathStyle:'>
-      <arg name='style' declared_type='NSPathStyle' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPlaceholderAttributedString:'>
-      <arg name='string' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPlaceholderString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSPathComponentCell'>
-    <method selector='URL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='setImage:'>
-      <arg name='value' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSPathControl'>
-    <method selector='URL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='clickedPathComponentCell'>
-      <retval declared_type='NSPathComponentCell*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='doubleAction'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='pathComponentCells'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='pathStyle'>
-      <retval declared_type='NSPathStyle' type='i' type64='q'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDoubleAction:'>
-      <arg name='action' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDraggingSourceOperationMask:forLocal:'>
-      <arg name='mask' declared_type='NSDragOperation' type='I' type64='Q' index='0'/>
-      <arg name='isLocal' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPathComponentCells:'>
-      <arg name='cells' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPathStyle:'>
-      <arg name='style' declared_type='NSPathStyle' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSPersistentDocument'>
-    <method selector='configurePersistentStoreCoordinatorForURL:ofType:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='fileType' declared_type='NSString*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='configurePersistentStoreCoordinatorForURL:ofType:modelConfiguration:storeOptions:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='fileType' declared_type='NSString*' type='@' index='1'/>
-      <arg name='configuration' declared_type='NSString*' type='@' index='2'/>
-      <arg name='storeOptions' declared_type='NSDictionary*' type='@' index='3'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='4'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='managedObjectContext'>
-      <retval declared_type='NSManagedObjectContext*' type='@'/>
-    </method>
-    <method selector='managedObjectModel'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='persistentStoreTypeForFileType:'>
-      <arg name='fileType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='readFromURL:ofType:error:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='revertToContentsOfURL:ofType:error:'>
-      <arg name='inAbsoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='inTypeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setManagedObjectContext:'>
-      <arg name='managedObjectContext' declared_type='NSManagedObjectContext*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='writeToURL:ofType:forSaveOperation:originalContentsURL:error:'>
-      <arg name='absoluteURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='saveOperation' declared_type='NSSaveOperationType' type='I' type64='Q' index='2'/>
-      <arg name='absoluteOriginalContentsURL' declared_type='NSURL*' type='@' index='3'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='4'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSPopUpButton'>
-    <method selector='addItemWithTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addItemsWithTitles:'>
-      <arg name='itemTitles' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='autoenablesItems'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='indexOfItem:'>
-      <arg name='item' declared_type='NSMenuItem*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithRepresentedObject:'>
-      <arg name='obj' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithTag:'>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithTarget:andAction:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <arg name='actionSelector' declared_type='SEL' type=':' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfSelectedItem'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='initWithFrame:pullsDown:'>
-      <arg name='buttonFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertItemWithTitle:atIndex:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='itemArray'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='itemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='itemTitleAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='itemTitles'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='itemWithTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='lastItem'>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='menu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='numberOfItems'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='preferredEdge'>
-      <retval declared_type='NSRectEdge' type='i' type64='Q'/>
-    </method>
-    <method selector='pullsDown'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='removeAllItems'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeItemWithTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectItem:'>
-      <arg name='item' declared_type='NSMenuItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectItemWithTag:'>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectItemWithTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedItem'>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='setAutoenablesItems:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenu:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPreferredEdge:'>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPullsDown:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='synchronizeTitleAndSelectedItem'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='titleOfSelectedItem'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSPopUpButtonCell'>
-    <method selector='addItemWithTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addItemsWithTitles:'>
-      <arg name='itemTitles' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='altersStateOfSelectedItem'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='arrowPosition'>
-      <retval declared_type='NSPopUpArrowPosition' type='I' type64='Q'/>
-    </method>
-    <method selector='attachPopUpWithFrame:inView:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='autoenablesItems'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='dismissPopUp'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='indexOfItem:'>
-      <arg name='item' declared_type='NSMenuItem*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithRepresentedObject:'>
-      <arg name='obj' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithTag:'>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithTarget:andAction:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <arg name='actionSelector' declared_type='SEL' type=':' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfItemWithTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfSelectedItem'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='initTextCell:pullsDown:'>
-      <arg name='stringValue' declared_type='NSString*' type='@' index='0'/>
-      <arg name='pullDown' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertItemWithTitle:atIndex:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='itemArray'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='itemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='itemTitleAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='itemTitles'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='itemWithTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='lastItem'>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='menu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='numberOfItems'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='objectValue'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='performClickWithFrame:inView:'>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='preferredEdge'>
-      <retval declared_type='NSRectEdge' type='i' type64='Q'/>
-    </method>
-    <method selector='pullsDown'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='removeAllItems'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeItemWithTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectItem:'>
-      <arg name='item' declared_type='NSMenuItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectItemWithTag:'>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectItemWithTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedItem'>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='setAltersStateOfSelectedItem:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setArrowPosition:'>
-      <arg name='position' declared_type='NSPopUpArrowPosition' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutoenablesItems:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenu:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObjectValue:'>
-      <arg name='obj' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPreferredEdge:'>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPullsDown:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesItemFromMenu:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='synchronizeTitleAndSelectedItem'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='titleOfSelectedItem'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='usesItemFromMenu'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSPredicateEditor'>
-    <method selector='rowTemplates'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='setRowTemplates:'>
-      <arg name='rowTemplates' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSPredicateEditorRowTemplate'>
-    <method selector='compoundTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='displayableSubpredicatesOfPredicate:'>
-      <arg name='predicate' declared_type='NSPredicate*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='initWithCompoundTypes:'>
-      <arg name='compoundTypes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithLeftExpressions:rightExpressionAttributeType:modifier:operators:options:'>
-      <arg name='leftExpressions' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='attributeType' declared_type='NSAttributeType' type='I' type64='Q' index='1'/>
-      <arg name='modifier' declared_type='NSComparisonPredicateModifier' type='I' type64='Q' index='2'/>
-      <arg name='operators' declared_type='NSArray*' type='@' index='3'/>
-      <arg name='options' declared_type='NSUInteger' type='I' type64='Q' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithLeftExpressions:rightExpressions:modifier:operators:options:'>
-      <arg name='leftExpressions' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='rightExpressions' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='modifier' declared_type='NSComparisonPredicateModifier' type='I' type64='Q' index='2'/>
-      <arg name='operators' declared_type='NSArray*' type='@' index='3'/>
-      <arg name='options' declared_type='NSUInteger' type='I' type64='Q' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='leftExpressions'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='matchForPredicate:'>
-      <arg name='predicate' declared_type='NSPredicate*' type='@' index='0'/>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='modifier'>
-      <retval declared_type='NSComparisonPredicateModifier' type='I' type64='Q'/>
-    </method>
-    <method selector='operators'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='options'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='predicateWithSubpredicates:'>
-      <arg name='subpredicates' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method selector='rightExpressionAttributeType'>
-      <retval declared_type='NSAttributeType' type='I' type64='Q'/>
-    </method>
-    <method selector='rightExpressions'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='setPredicate:'>
-      <arg name='predicate' declared_type='NSPredicate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='templateViews'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='templatesWithAttributeKeyPaths:inEntityDescription:'>
-      <arg name='keyPaths' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='entityDescription' declared_type='NSEntityDescription*' type='@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSPrintInfo'>
-    <method selector='PMPageFormat'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='PMPrintSession'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='PMPrintSettings'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='bottomMargin'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='defaultPrinter'>
-      <retval declared_type='NSPrinter*' type='@'/>
-    </method>
-    <method selector='dictionary'>
-      <retval declared_type='NSMutableDictionary*' type='@'/>
-    </method>
-    <method selector='horizontalPagination'>
-      <retval declared_type='NSPrintingPaginationMode' type='I' type64='Q'/>
-    </method>
-    <method selector='imageablePageBounds'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='initWithDictionary:'>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isHorizontallyCentered'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isVerticallyCentered'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='jobDisposition'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='leftMargin'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='localizedPaperName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='orientation'>
-      <retval declared_type='NSPrintingOrientation' type='I' type64='Q'/>
-    </method>
-    <method selector='paperName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='paperSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='printSettings'>
-      <retval declared_type='NSMutableDictionary*' type='@'/>
-    </method>
-    <method selector='printer'>
-      <retval declared_type='NSPrinter*' type='@'/>
-    </method>
-    <method selector='rightMargin'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='setBottomMargin:'>
-      <arg name='margin' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setDefaultPrinter:'>
-      <arg name='printer' declared_type='NSPrinter*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHorizontalPagination:'>
-      <arg name='mode' declared_type='NSPrintingPaginationMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHorizontallyCentered:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setJobDisposition:'>
-      <arg name='disposition' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLeftMargin:'>
-      <arg name='margin' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOrientation:'>
-      <arg name='orientation' declared_type='NSPrintingOrientation' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPaperName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPaperSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPrinter:'>
-      <arg name='printer' declared_type='NSPrinter*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRightMargin:'>
-      <arg name='margin' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setSharedPrintInfo:'>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTopMargin:'>
-      <arg name='margin' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUpPrintOperationDefaultValues'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVerticalPagination:'>
-      <arg name='mode' declared_type='NSPrintingPaginationMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVerticallyCentered:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedPrintInfo'>
-      <retval declared_type='NSPrintInfo*' type='@'/>
-    </method>
-    <method class_method='true' selector='sizeForPaperName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='topMargin'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='updateFromPMPageFormat'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='updateFromPMPrintSettings'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='verticalPagination'>
-      <retval declared_type='NSPrintingPaginationMode' type='I' type64='Q'/>
-    </method>
-  </class>
-  <class name='NSPrintOperation'>
-    <method class_method='true' selector='EPSOperationWithView:insideRect:toData:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='data' declared_type='NSMutableData*' type='@' index='2'/>
-      <retval declared_type='NSPrintOperation*' type='@'/>
-    </method>
-    <method class_method='true' selector='EPSOperationWithView:insideRect:toData:printInfo:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='data' declared_type='NSMutableData*' type='@' index='2'/>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='3'/>
-      <retval declared_type='NSPrintOperation*' type='@'/>
-    </method>
-    <method class_method='true' selector='EPSOperationWithView:insideRect:toPath:printInfo:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='path' declared_type='NSString*' type='@' index='2'/>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='3'/>
-      <retval declared_type='NSPrintOperation*' type='@'/>
-    </method>
-    <method class_method='true' selector='PDFOperationWithView:insideRect:toData:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='data' declared_type='NSMutableData*' type='@' index='2'/>
-      <retval declared_type='NSPrintOperation*' type='@'/>
-    </method>
-    <method class_method='true' selector='PDFOperationWithView:insideRect:toData:printInfo:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='data' declared_type='NSMutableData*' type='@' index='2'/>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='3'/>
-      <retval declared_type='NSPrintOperation*' type='@'/>
-    </method>
-    <method class_method='true' selector='PDFOperationWithView:insideRect:toPath:printInfo:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='path' declared_type='NSString*' type='@' index='2'/>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='3'/>
-      <retval declared_type='NSPrintOperation*' type='@'/>
-    </method>
-    <method selector='accessoryView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='canSpawnSeparateThread'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cleanUpOperation'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='context'>
-      <retval declared_type='NSGraphicsContext*' type='@'/>
-    </method>
-    <method selector='createContext'>
-      <retval declared_type='NSGraphicsContext*' type='@'/>
-    </method>
-    <method class_method='true' selector='currentOperation'>
-      <retval declared_type='NSPrintOperation*' type='@'/>
-    </method>
-    <method selector='currentPage'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='deliverResult'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='destroyContext'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isCopyingOperation'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='jobStyleHint'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='jobTitle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pageOrder'>
-      <retval declared_type='NSPrintingPageOrder' type='i' type64='q'/>
-    </method>
-    <method selector='pageRange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='printInfo'>
-      <retval declared_type='NSPrintInfo*' type='@'/>
-    </method>
-    <method class_method='true' selector='printOperationWithView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='NSPrintOperation*' type='@'/>
-    </method>
-    <method class_method='true' selector='printOperationWithView:printInfo:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='1'/>
-      <retval declared_type='NSPrintOperation*' type='@'/>
-    </method>
-    <method selector='printPanel'>
-      <retval declared_type='NSPrintPanel*' type='@'/>
-    </method>
-    <method selector='runOperation'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='runOperationModalForWindow:delegate:didRunSelector:contextInfo:'>
-      <arg name='docWindow' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='delegate' declared_type='id' type='@' index='1'/>
-      <arg name='didRunSelector' declared_type='SEL' type=':' index='2'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAccessoryView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCanSpawnSeparateThread:'>
-      <arg name='canSpawnSeparateThread' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setCurrentOperation:'>
-      <arg name='operation' declared_type='NSPrintOperation*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setJobStyleHint:'>
-      <arg name='hint' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setJobTitle:'>
-      <arg name='jobTitle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPageOrder:'>
-      <arg name='pageOrder' declared_type='NSPrintingPageOrder' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPrintInfo:'>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPrintPanel:'>
-      <arg name='panel' declared_type='NSPrintPanel*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowPanels:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsPrintPanel:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsProgressPanel:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showPanels'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='showsPrintPanel'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='showsProgressPanel'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='view'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-  </class>
-  <class name='NSPrintPanel'>
-    <method selector='accessoryControllers'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='accessoryView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='addAccessoryController:'>
-      <arg name='accessoryController' declared_type='NSViewController&lt;NSPrintPanelAccessorizing&gt;*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='beginSheetWithPrintInfo:modalForWindow:delegate:didEndSelector:contextInfo:'>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='0'/>
-      <arg name='docWindow' declared_type='NSWindow*' type='@' index='1'/>
-      <arg name='delegate' declared_type='id' type='@' index='2'/>
-      <arg name='didEndSelector' declared_type='SEL' type=':' index='3'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='defaultButtonTitle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='finalWritePrintInfo'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='helpAnchor'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='jobStyleHint'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='options'>
-      <retval declared_type='NSPrintPanelOptions' type='i' type64='q'/>
-    </method>
-    <method selector='printInfo'>
-      <retval declared_type='NSPrintInfo*' type='@'/>
-    </method>
-    <method class_method='true' selector='printPanel'>
-      <retval declared_type='NSPrintPanel*' type='@'/>
-    </method>
-    <method selector='removeAccessoryController:'>
-      <arg name='accessoryController' declared_type='NSViewController&lt;NSPrintPanelAccessorizing&gt;*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='runModal'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='runModalWithPrintInfo:'>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setAccessoryView:'>
-      <arg name='accessoryView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDefaultButtonTitle:'>
-      <arg name='defaultButtonTitle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHelpAnchor:'>
-      <arg name='helpAnchor' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setJobStyleHint:'>
-      <arg name='hint' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOptions:'>
-      <arg name='options' declared_type='NSPrintPanelOptions' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='updateFromPrintInfo'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSPrinter'>
-    <method selector='acceptsBinary'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='booleanForKey:inTable:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='table' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='deviceDescription'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='domain'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='floatForKey:inTable:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='table' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='host'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='imageRectForPaper:'>
-      <arg name='paperName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='intForKey:inTable:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='table' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='isColor'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isFontAvailable:'>
-      <arg name='faceName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isKey:inTable:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='table' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isOutputStackInReverseOrder'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='languageLevel'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='note'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pageSizeForPaper:'>
-      <arg name='paperName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method class_method='true' selector='printerNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='printerTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='printerWithName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSPrinter*' type='@'/>
-    </method>
-    <method class_method='true' selector='printerWithName:domain:includeUnavailable:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='domain' declared_type='NSString*' type='@' index='1'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='NSPrinter*' type='@'/>
-    </method>
-    <method class_method='true' selector='printerWithType:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSPrinter*' type='@'/>
-    </method>
-    <method selector='rectForKey:inTable:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='table' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='sizeForKey:inTable:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='table' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='statusForTable:'>
-      <arg name='tableName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSPrinterTableStatus' type='I' type64='Q'/>
-    </method>
-    <method selector='stringForKey:inTable:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='table' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringListForKey:inTable:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='table' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='type'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSProgressIndicator'>
-    <method selector='animate:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='animationDelay'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='controlSize'>
-      <retval declared_type='NSControlSize' type='I' type64='Q'/>
-    </method>
-    <method selector='controlTint'>
-      <retval declared_type='NSControlTint' type='I' type64='Q'/>
-    </method>
-    <method selector='doubleValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='incrementBy:'>
-      <arg name='delta' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isBezeled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isDisplayedWhenStopped'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isIndeterminate'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='maxValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='minValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='setAnimationDelay:'>
-      <arg name='delay' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBezeled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setControlSize:'>
-      <arg name='size' declared_type='NSControlSize' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setControlTint:'>
-      <arg name='tint' declared_type='NSControlTint' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDisplayedWhenStopped:'>
-      <arg name='isDisplayed' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDoubleValue:'>
-      <arg name='doubleValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIndeterminate:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxValue:'>
-      <arg name='newMaximum' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinValue:'>
-      <arg name='newMinimum' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStyle:'>
-      <arg name='style' declared_type='NSProgressIndicatorStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesThreadedAnimation:'>
-      <arg name='threadedAnimation' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sizeToFit'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='startAnimation:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopAnimation:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='style'>
-      <retval declared_type='NSProgressIndicatorStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='usesThreadedAnimation'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSQuickDrawView'>
-    <method selector='qdPort'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-  </class>
-  <class name='NSResponder'>
-    <method selector='acceptsFirstResponder'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='becomeFirstResponder'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cancelOperation:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='capitalizeWord:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='centerSelectionInVisibleArea:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='changeCaseOfLetter:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='complete:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='cursorUpdate:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteBackward:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteBackwardByDecomposingPreviousCharacter:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteForward:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteToBeginningOfLine:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteToBeginningOfParagraph:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteToEndOfLine:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteToEndOfParagraph:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteToMark:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteWordBackward:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteWordForward:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='doCommandBySelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='flagsChanged:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='flushBufferedKeyEvents'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='helpRequested:'>
-      <arg name='eventPtr' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='indent:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertBacktab:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertContainerBreak:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertLineBreak:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertNewline:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertNewlineIgnoringFieldEditor:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertParagraphSeparator:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertTab:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertTabIgnoringFieldEditor:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertText:'>
-      <arg name='insertString' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='interfaceStyle'>
-      <retval declared_type='NSInterfaceStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='interpretKeyEvents:'>
-      <arg name='eventArray' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='keyDown:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='keyUp:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='lowercaseWord:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='menu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='mouseDown:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='mouseDragged:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='mouseEntered:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='mouseExited:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='mouseMoved:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='mouseUp:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveBackward:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveBackwardAndModifySelection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveDown:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveDownAndModifySelection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveForward:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveForwardAndModifySelection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveLeft:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveLeftAndModifySelection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveRight:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveRightAndModifySelection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveToBeginningOfDocument:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveToBeginningOfLine:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveToBeginningOfParagraph:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveToEndOfDocument:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveToEndOfLine:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveToEndOfParagraph:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveUp:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveUpAndModifySelection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveWordBackward:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveWordBackwardAndModifySelection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveWordForward:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveWordForwardAndModifySelection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveWordLeft:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveWordLeftAndModifySelection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveWordRight:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveWordRightAndModifySelection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='nextResponder'>
-      <retval declared_type='NSResponder*' type='@'/>
-    </method>
-    <method selector='noResponderFor:'>
-      <arg name='eventSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='otherMouseDown:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='otherMouseDragged:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='otherMouseUp:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pageDown:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pageUp:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performKeyEquivalent:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='performMnemonic:'>
-      <arg name='theString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='presentError:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='presentError:modalForWindow:delegate:didPresentSelector:contextInfo:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <arg name='window' declared_type='NSWindow*' type='@' index='1'/>
-      <arg name='delegate' declared_type='id' type='@' index='2'/>
-      <arg name='didPresentSelector' declared_type='SEL' type=':' index='3'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resignFirstResponder'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rightMouseDown:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rightMouseDragged:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rightMouseUp:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollLineDown:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollLineUp:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollPageDown:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollPageUp:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollWheel:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectAll:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectLine:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectParagraph:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectToMark:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectWord:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setInterfaceStyle:'>
-      <arg name='interfaceStyle' declared_type='NSInterfaceStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMark:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenu:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNextResponder:'>
-      <arg name='aResponder' declared_type='NSResponder*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shouldBeTreatedAsInkEvent:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='showContextHelp:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='swapWithMark:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tabletPoint:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tabletProximity:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='transpose:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='transposeWords:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tryToPerform:with:'>
-      <arg name='anAction' declared_type='SEL' type=':' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='undoManager'>
-      <retval declared_type='NSUndoManager*' type='@'/>
-    </method>
-    <method selector='uppercaseWord:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='validRequestorForSendType:returnType:'>
-      <arg name='sendType' declared_type='NSString*' type='@' index='0'/>
-      <arg name='returnType' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='willPresentError:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <retval declared_type='NSError*' type='@'/>
-    </method>
-    <method selector='yank:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSRuleEditor'>
-    <method selector='addRow:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='canRemoveAllRows'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='criteriaForRow:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='criteriaKeyPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='displayValuesForRow:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='displayValuesKeyPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='formattingDictionary'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='formattingStringsFilename'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='insertRowAtIndex:withType:asSubrowOfRow:animate:'>
-      <arg name='rowIndex' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='rowType' declared_type='NSRuleEditorRowType' type='I' type64='Q' index='1'/>
-      <arg name='parentRow' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='shouldAnimate' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isEditable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='nestingMode'>
-      <retval declared_type='NSRuleEditorNestingMode' type='I' type64='Q'/>
-    </method>
-    <method selector='numberOfRows'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='parentRowForRow:'>
-      <arg name='rowIndex' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='predicate'>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method selector='predicateForRow:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method selector='reloadCriteria'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='reloadPredicate'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeRowAtIndex:'>
-      <arg name='rowIndex' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeRowsAtIndexes:includeSubrows:'>
-      <arg name='rowIndexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <arg name='includeSubrows' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rowClass'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='rowForDisplayValue:'>
-      <arg name='displayValue' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='rowHeight'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='rowTypeForRow:'>
-      <arg name='rowIndex' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRuleEditorRowType' type='I' type64='Q'/>
-    </method>
-    <method selector='rowTypeKeyPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='selectRowIndexes:byExtendingSelection:'>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <arg name='extend' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedRowIndexes'>
-      <retval declared_type='NSIndexSet*' type='@'/>
-    </method>
-    <method selector='setCanRemoveAllRows:'>
-      <arg name='val' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCriteria:andDisplayValues:forRowAtIndex:'>
-      <arg name='criteria' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='values' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='rowIndex' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCriteriaKeyPath:'>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDisplayValuesKeyPath:'>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEditable:'>
-      <arg name='editable' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFormattingDictionary:'>
-      <arg name='dictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFormattingStringsFilename:'>
-      <arg name='stringsFilename' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNestingMode:'>
-      <arg name='mode' declared_type='NSRuleEditorNestingMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRowClass:'>
-      <arg name='rowClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRowHeight:'>
-      <arg name='height' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRowTypeKeyPath:'>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSubrowsKeyPath:'>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='subrowIndexesForRow:'>
-      <arg name='rowIndex' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSIndexSet*' type='@'/>
-    </method>
-    <method selector='subrowsKeyPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSRulerMarker'>
-    <method selector='drawRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='imageOrigin'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='imageRectInRuler'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='initWithRulerView:markerLocation:image:imageOrigin:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='location' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='image' declared_type='NSImage*' type='@' index='2'/>
-      <arg name='imageOrigin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isDragging'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isMovable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isRemovable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='markerLocation'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='representedObject'>
-      <retval declared_type='id &lt;NSCopying&gt;' type='@'/>
-    </method>
-    <method selector='ruler'>
-      <retval declared_type='NSRulerView*' type='@'/>
-    </method>
-    <method selector='setImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImageOrigin:'>
-      <arg name='imageOrigin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMarkerLocation:'>
-      <arg name='location' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMovable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRemovable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRepresentedObject:'>
-      <arg name='representedObject' declared_type='id &lt;NSCopying&gt;' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='thicknessRequiredInRuler'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='trackMouse:adding:'>
-      <arg name='mouseDownEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='isAdding' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSRulerView'>
-    <method selector='accessoryView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='addMarker:'>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='baselineLocation'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='clientView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='drawHashMarksAndLabelsInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawMarkersInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithScrollView:orientation:'>
-      <arg name='scrollView' declared_type='NSScrollView*' type='@' index='0'/>
-      <arg name='orientation' declared_type='NSRulerOrientation' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='invalidateHashMarks'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isFlipped'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='markers'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='measurementUnits'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='moveRulerlineFromLocation:toLocation:'>
-      <arg name='oldLocation' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='newLocation' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orientation'>
-      <retval declared_type='NSRulerOrientation' type='I' type64='Q'/>
-    </method>
-    <method selector='originOffset'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='registerUnitWithName:abbreviation:unitToPointsConversionFactor:stepUpCycle:stepDownCycle:'>
-      <arg name='unitName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='abbreviation' declared_type='NSString*' type='@' index='1'/>
-      <arg name='conversionFactor' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <arg name='stepUpCycle' declared_type='NSArray*' type='@' index='3'/>
-      <arg name='stepDownCycle' declared_type='NSArray*' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeMarker:'>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='requiredThickness'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='reservedThicknessForAccessoryView'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='reservedThicknessForMarkers'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='ruleThickness'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='scrollView'>
-      <retval declared_type='NSScrollView*' type='@'/>
-    </method>
-    <method selector='setAccessoryView:'>
-      <arg name='accessory' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setClientView:'>
-      <arg name='client' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMarkers:'>
-      <arg name='markers' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMeasurementUnits:'>
-      <arg name='unitName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOrientation:'>
-      <arg name='orientation' declared_type='NSRulerOrientation' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOriginOffset:'>
-      <arg name='offset' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setReservedThicknessForAccessoryView:'>
-      <arg name='thickness' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setReservedThicknessForMarkers:'>
-      <arg name='thickness' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRuleThickness:'>
-      <arg name='thickness' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setScrollView:'>
-      <arg name='scrollView' declared_type='NSScrollView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='trackMarker:withMouseEvent:'>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='0'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSSavePanel'>
-    <method selector='URL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='accessoryView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='allowedFileTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='allowsOtherFileTypes'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='beginSheetForDirectory:file:modalForWindow:modalDelegate:didEndSelector:contextInfo:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <arg name='docWindow' declared_type='NSWindow*' type='@' index='2'/>
-      <arg name='delegate' declared_type='id' type='@' index='3'/>
-      <arg name='didEndSelector' declared_type='SEL' type=':' index='4'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='5'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='canCreateDirectories'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canSelectHiddenExtension'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cancel:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='directory'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='filename'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='isExpanded'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isExtensionHidden'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='message'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='nameFieldLabel'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='ok:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='prompt'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='requiredFileType'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='runModal'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='runModalForDirectory:file:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='savePanel'>
-      <retval declared_type='NSSavePanel*' type='@'/>
-    </method>
-    <method selector='selectText:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAccessoryView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowedFileTypes:'>
-      <arg name='types' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsOtherFileTypes:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCanCreateDirectories:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCanSelectHiddenExtension:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDirectory:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setExtensionHidden:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMessage:'>
-      <arg name='message' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNameFieldLabel:'>
-      <arg name='label' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPrompt:'>
-      <arg name='prompt' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRequiredFileType:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTreatsFilePackagesAsDirectories:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='treatsFilePackagesAsDirectories'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='validateVisibleColumns'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSScreen'>
-    <method class_method='true' selector='deepestScreen'>
-      <retval declared_type='NSScreen*' type='@'/>
-    </method>
-    <method selector='depth'>
-      <retval declared_type='NSWindowDepth' type='i'/>
-    </method>
-    <method selector='deviceDescription'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='frame'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method class_method='true' selector='mainScreen'>
-      <retval declared_type='NSScreen*' type='@'/>
-    </method>
-    <method class_method='true' selector='screens'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='supportedWindowDepths'>
-      <retval declared_type='NSWindowDepth*' type='^i' const='true'/>
-    </method>
-    <method selector='userSpaceScaleFactor'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='visibleFrame'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-  </class>
-  <class name='NSScrollView'>
-    <method selector='autohidesScrollers'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='borderType'>
-      <retval declared_type='NSBorderType' type='I' type64='Q'/>
-    </method>
-    <method selector='contentSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method class_method='true' selector='contentSizeForFrameSize:hasHorizontalScroller:hasVerticalScroller:borderType:'>
-      <arg name='fSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <arg name='hFlag' declared_type='BOOL' type='B' index='1'/>
-      <arg name='vFlag' declared_type='BOOL' type='B' index='2'/>
-      <arg name='aType' declared_type='NSBorderType' type='I' type64='Q' index='3'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='contentView'>
-      <retval declared_type='NSClipView*' type='@'/>
-    </method>
-    <method selector='documentCursor'>
-      <retval declared_type='NSCursor*' type='@'/>
-    </method>
-    <method selector='documentView'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='documentVisibleRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='drawsBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='frameSizeForContentSize:hasHorizontalScroller:hasVerticalScroller:borderType:'>
-      <arg name='cSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <arg name='hFlag' declared_type='BOOL' type='B' index='1'/>
-      <arg name='vFlag' declared_type='BOOL' type='B' index='2'/>
-      <arg name='aType' declared_type='NSBorderType' type='I' type64='Q' index='3'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='hasHorizontalRuler'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasHorizontalScroller'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasVerticalRuler'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasVerticalScroller'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='horizontalLineScroll'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='horizontalPageScroll'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='horizontalRulerView'>
-      <retval declared_type='NSRulerView*' type='@'/>
-    </method>
-    <method selector='horizontalScroller'>
-      <retval declared_type='NSScroller*' type='@'/>
-    </method>
-    <method selector='lineScroll'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='pageScroll'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='reflectScrolledClipView:'>
-      <arg name='cView' declared_type='NSClipView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='rulerViewClass'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='rulersVisible'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scrollWheel:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollsDynamically'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAutohidesScrollers:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderType:'>
-      <arg name='aType' declared_type='NSBorderType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentView:'>
-      <arg name='contentView' declared_type='NSClipView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDocumentCursor:'>
-      <arg name='anObj' declared_type='NSCursor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDocumentView:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsBackground:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHasHorizontalRuler:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHasHorizontalScroller:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHasVerticalRuler:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHasVerticalScroller:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHorizontalLineScroll:'>
-      <arg name='value' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHorizontalPageScroll:'>
-      <arg name='value' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHorizontalRulerView:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHorizontalScroller:'>
-      <arg name='anObject' declared_type='NSScroller*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineScroll:'>
-      <arg name='value' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPageScroll:'>
-      <arg name='value' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setRulerViewClass:'>
-      <arg name='rulerViewClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRulersVisible:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setScrollsDynamically:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVerticalLineScroll:'>
-      <arg name='value' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVerticalPageScroll:'>
-      <arg name='value' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVerticalRulerView:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVerticalScroller:'>
-      <arg name='anObject' declared_type='NSScroller*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tile'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='verticalLineScroll'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='verticalPageScroll'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='verticalRulerView'>
-      <retval declared_type='NSRulerView*' type='@'/>
-    </method>
-    <method selector='verticalScroller'>
-      <retval declared_type='NSScroller*' type='@'/>
-    </method>
-  </class>
-  <class name='NSScroller'>
-    <method selector='arrowsPosition'>
-      <retval declared_type='NSScrollArrowPosition' type='I' type64='Q'/>
-    </method>
-    <method selector='checkSpaceForParts'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='controlSize'>
-      <retval declared_type='NSControlSize' type='I' type64='Q'/>
-    </method>
-    <method selector='controlTint'>
-      <retval declared_type='NSControlTint' type='I' type64='Q'/>
-    </method>
-    <method selector='drawArrow:highlight:'>
-      <arg name='whichArrow' declared_type='NSScrollerArrow' type='I' type64='Q' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawKnob'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawKnobSlotInRect:highlight:'>
-      <arg name='slotRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawParts'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='highlight:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='hitPart'>
-      <retval declared_type='NSScrollerPart' type='I' type64='Q'/>
-    </method>
-    <method selector='knobProportion'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='rectForPart:'>
-      <arg name='partCode' declared_type='NSScrollerPart' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method class_method='true' selector='scrollerWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='scrollerWidthForControlSize:'>
-      <arg name='controlSize' declared_type='NSControlSize' type='I' type64='Q' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='setArrowsPosition:'>
-      <arg name='where' declared_type='NSScrollArrowPosition' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setControlSize:'>
-      <arg name='controlSize' declared_type='NSControlSize' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setControlTint:'>
-      <arg name='controlTint' declared_type='NSControlTint' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFloatValue:knobProportion:'>
-      <arg name='aFloat' declared_type='float' type='f' index='0'/>
-      <arg name='proportion' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKnobProportion:'>
-      <arg name='proportion' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='testPart:'>
-      <arg name='thePoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSScrollerPart' type='I' type64='Q'/>
-    </method>
-    <method selector='trackKnob:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='trackScrollButtons:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='usableParts'>
-      <retval declared_type='NSUsableScrollerParts' type='I' type64='Q'/>
-    </method>
-  </class>
-  <class name='NSSearchField'>
-    <method selector='recentSearches'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='recentsAutosaveName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setRecentSearches:'>
-      <arg name='searches' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRecentsAutosaveName:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSSearchFieldCell'>
-    <method selector='cancelButtonCell'>
-      <retval declared_type='NSButtonCell*' type='@'/>
-    </method>
-    <method selector='cancelButtonRectForBounds:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='maximumRecents'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='recentSearches'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='recentsAutosaveName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='resetCancelButtonCell'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resetSearchButtonCell'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='searchButtonCell'>
-      <retval declared_type='NSButtonCell*' type='@'/>
-    </method>
-    <method selector='searchButtonRectForBounds:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='searchMenuTemplate'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='searchTextRectForBounds:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='sendsSearchStringImmediately'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='sendsWholeSearchString'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setCancelButtonCell:'>
-      <arg name='cell' declared_type='NSButtonCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaximumRecents:'>
-      <arg name='maxRecents' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRecentSearches:'>
-      <arg name='searches' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRecentsAutosaveName:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSearchButtonCell:'>
-      <arg name='cell' declared_type='NSButtonCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSearchMenuTemplate:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSendsSearchStringImmediately:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSendsWholeSearchString:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSSecureTextFieldCell'>
-    <method selector='echosBullets'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setEchosBullets:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSSegmentedCell'>
-    <method selector='drawSegment:inFrame:withView:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='imageForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='imageScalingForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSImageScaling' type='I' type64='Q'/>
-    </method>
-    <method selector='interiorBackgroundStyleForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSBackgroundStyle' type='i' type64='q'/>
-    </method>
-    <method selector='isEnabledForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSelectedForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='labelForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='makeNextSegmentKey'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='makePreviousSegmentKey'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='menuForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='segmentCount'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='segmentStyle'>
-      <retval declared_type='NSSegmentStyle' type='i' type64='q'/>
-    </method>
-    <method selector='selectSegmentWithTag:'>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectedSegment'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setEnabled:forSegment:'>
-      <arg name='enabled' declared_type='BOOL' type='B' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImage:forSegment:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImageScaling:forSegment:'>
-      <arg name='scaling' declared_type='NSImageScaling' type='I' type64='Q' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLabel:forSegment:'>
-      <arg name='label' declared_type='NSString*' type='@' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenu:forSegment:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSegmentCount:'>
-      <arg name='count' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSegmentStyle:'>
-      <arg name='segmentStyle' declared_type='NSSegmentStyle' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelected:forSegment:'>
-      <arg name='selected' declared_type='BOOL' type='B' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedSegment:'>
-      <arg name='selectedSegment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTag:forSegment:'>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setToolTip:forSegment:'>
-      <arg name='toolTip' declared_type='NSString*' type='@' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTrackingMode:'>
-      <arg name='trackingMode' declared_type='NSSegmentSwitchTracking' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWidth:forSegment:'>
-      <arg name='width' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tagForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='toolTipForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='trackingMode'>
-      <retval declared_type='NSSegmentSwitchTracking' type='I' type64='Q'/>
-    </method>
-    <method selector='widthForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-  </class>
-  <class name='NSSegmentedControl'>
-    <method selector='imageForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='imageScalingForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSImageScaling' type='I' type64='Q'/>
-    </method>
-    <method selector='isEnabledForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSelectedForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='labelForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='menuForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='segmentCount'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='segmentStyle'>
-      <retval declared_type='NSSegmentStyle' type='i' type64='q'/>
-    </method>
-    <method selector='selectSegmentWithTag:'>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectedSegment'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setEnabled:forSegment:'>
-      <arg name='enabled' declared_type='BOOL' type='B' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImage:forSegment:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImageScaling:forSegment:'>
-      <arg name='scaling' declared_type='NSImageScaling' type='I' type64='Q' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLabel:forSegment:'>
-      <arg name='label' declared_type='NSString*' type='@' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenu:forSegment:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSegmentCount:'>
-      <arg name='count' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSegmentStyle:'>
-      <arg name='segmentStyle' declared_type='NSSegmentStyle' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelected:forSegment:'>
-      <arg name='selected' declared_type='BOOL' type='B' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedSegment:'>
-      <arg name='selectedSegment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWidth:forSegment:'>
-      <arg name='width' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='widthForSegment:'>
-      <arg name='segment' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-  </class>
-  <class name='NSShadow'>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='set'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShadowBlurRadius:'>
-      <arg name='val' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShadowColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShadowOffset:'>
-      <arg name='offset' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shadowBlurRadius'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='shadowColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='shadowOffset'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-  </class>
-  <class name='NSSlider'>
-    <method selector='acceptsFirstMouse:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsTickMarkValuesOnly'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='altIncrementValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='closestTickMarkValueToValue:'>
-      <arg name='value' declared_type='double' type='d' index='0'/>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='indexOfTickMarkAtPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='isVertical'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='knobThickness'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='maxValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='minValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='numberOfTickMarks'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='rectOfTickMarkAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='setAllowsTickMarkValuesOnly:'>
-      <arg name='yorn' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAltIncrementValue:'>
-      <arg name='incValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImage:'>
-      <arg name='backgroundImage' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKnobThickness:'>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxValue:'>
-      <arg name='aDouble' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinValue:'>
-      <arg name='aDouble' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNumberOfTickMarks:'>
-      <arg name='count' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTickMarkPosition:'>
-      <arg name='position' declared_type='NSTickMarkPosition' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleCell:'>
-      <arg name='aCell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleColor:'>
-      <arg name='newColor' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tickMarkPosition'>
-      <retval declared_type='NSTickMarkPosition' type='I' type64='Q'/>
-    </method>
-    <method selector='tickMarkValueAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='titleCell'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='titleColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='titleFont'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-  </class>
-  <class name='NSSliderCell'>
-    <method selector='allowsTickMarkValuesOnly'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='altIncrementValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='closestTickMarkValueToValue:'>
-      <arg name='value' declared_type='double' type='d' index='0'/>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='drawBarInside:flipped:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='flipped' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawKnob'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawKnob:'>
-      <arg name='knobRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='indexOfTickMarkAtPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='isVertical'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='knobRectFlipped:'>
-      <arg name='flipped' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='knobThickness'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='maxValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='minValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='numberOfTickMarks'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='prefersTrackingUntilMouseUp'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rectOfTickMarkAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='setAllowsTickMarkValuesOnly:'>
-      <arg name='yorn' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAltIncrementValue:'>
-      <arg name='incValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKnobThickness:'>
-      <arg name='aFloat' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxValue:'>
-      <arg name='aDouble' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinValue:'>
-      <arg name='aDouble' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNumberOfTickMarks:'>
-      <arg name='count' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSliderType:'>
-      <arg name='sliderType' declared_type='NSSliderType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTickMarkPosition:'>
-      <arg name='position' declared_type='NSTickMarkPosition' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleCell:'>
-      <arg name='aCell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleColor:'>
-      <arg name='newColor' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleFont:'>
-      <arg name='fontObj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sliderType'>
-      <retval declared_type='NSSliderType' type='I' type64='Q'/>
-    </method>
-    <method selector='tickMarkPosition'>
-      <retval declared_type='NSTickMarkPosition' type='I' type64='Q'/>
-    </method>
-    <method selector='tickMarkValueAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='titleCell'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='titleColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='titleFont'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='trackRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-  </class>
-  <class name='NSSound'>
-    <method class_method='true' selector='canInitWithPasteboard:'>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='channelMapping'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='currentTime'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='duration'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='initWithContentsOfFile:byReference:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='byRef' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:byReference:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='byRef' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithPasteboard:'>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isPlaying'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='loops'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pause'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='play'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='playbackDeviceIdentifier'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='resume'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setChannelMapping:'>
-      <arg name='channelMapping' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCurrentTime:'>
-      <arg name='seconds' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='aDelegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLoops:'>
-      <arg name='val' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setName:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setPlaybackDeviceIdentifier:'>
-      <arg name='deviceUID' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVolume:'>
-      <arg name='volume' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='soundNamed:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='soundUnfilteredFileTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='soundUnfilteredPasteboardTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='soundUnfilteredTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='stop'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='volume'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='writeToPasteboard:'>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSSpeechRecognizer'>
-    <method selector='blocksOtherRecognizers'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='commands'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='displayedCommandsTitle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='listensInForegroundOnly'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setBlocksOtherRecognizers:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCommands:'>
-      <arg name='commands' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDisplayedCommandsTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setListensInForegroundOnly:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='startListening'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopListening'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSSpeechSynthesizer'>
-    <method selector='addSpeechDictionary:'>
-      <arg name='speechDictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='attributesForVoice:'>
-      <arg name='voice' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method class_method='true' selector='availableVoices'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='continueSpeaking'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='defaultVoice'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithVoice:'>
-      <arg name='voice' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='isAnyApplicationSpeaking'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSpeaking'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='objectForProperty:error:'>
-      <arg name='property' declared_type='NSString*' type='@' index='0'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='pauseSpeakingAtBoundary:'>
-      <arg name='boundary' declared_type='NSSpeechBoundary' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='phonemesFromText:'>
-      <arg name='text' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='rate'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObject:forProperty:error:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <arg name='property' declared_type='NSString*' type='@' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setRate:'>
-      <arg name='rate' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesFeedbackWindow:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVoice:'>
-      <arg name='voice' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setVolume:'>
-      <arg name='volume' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='startSpeakingString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='startSpeakingString:toURL:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='url' declared_type='NSURL*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='stopSpeaking'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopSpeakingAtBoundary:'>
-      <arg name='boundary' declared_type='NSSpeechBoundary' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='usesFeedbackWindow'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='voice'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='volume'>
-      <retval declared_type='float' type='f'/>
-    </method>
-  </class>
-  <class name='NSSpellChecker'>
-    <method selector='accessoryView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='availableLanguages'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='checkGrammarOfString:startingAt:language:wrap:inSpellDocumentWithTag:details:'>
-      <arg name='stringToCheck' declared_type='NSString*' type='@' index='0'/>
-      <arg name='startingOffset' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='language' declared_type='NSString*' type='@' index='2'/>
-      <arg name='wrapFlag' declared_type='BOOL' type='B' index='3'/>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <arg name='details' declared_type='NSArray**' type='^@' index='5'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='checkSpellingOfString:startingAt:'>
-      <arg name='stringToCheck' declared_type='NSString*' type='@' index='0'/>
-      <arg name='startingOffset' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='checkSpellingOfString:startingAt:language:wrap:inSpellDocumentWithTag:wordCount:'>
-      <arg name='stringToCheck' declared_type='NSString*' type='@' index='0'/>
-      <arg name='startingOffset' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='language' declared_type='NSString*' type='@' index='2'/>
-      <arg name='wrapFlag' declared_type='BOOL' type='B' index='3'/>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <arg name='wordCount' declared_type='NSInteger*' type='^i' type64='^q' index='5'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='closeSpellDocumentWithTag:'>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='completionsForPartialWordRange:inString:language:inSpellDocumentWithTag:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='string' declared_type='NSString*' type='@' index='1'/>
-      <arg name='language' declared_type='NSString*' type='@' index='2'/>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='countWordsInString:language:'>
-      <arg name='stringToCount' declared_type='NSString*' type='@' index='0'/>
-      <arg name='language' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='forgetWord:'>
-      <arg name='word' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='guessesForWord:'>
-      <arg name='word' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='hasLearnedWord:'>
-      <arg name='word' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='ignoreWord:inSpellDocumentWithTag:'>
-      <arg name='wordToIgnore' declared_type='NSString*' type='@' index='0'/>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='ignoredWordsInSpellDocumentWithTag:'>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='language'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='learnWord:'>
-      <arg name='word' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAccessoryView:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIgnoredWords:inSpellDocumentWithTag:'>
-      <arg name='words' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLanguage:'>
-      <arg name='language' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setWordFieldStringValue:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedSpellChecker'>
-      <retval declared_type='NSSpellChecker*' type='@'/>
-    </method>
-    <method class_method='true' selector='sharedSpellCheckerExists'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='spellingPanel'>
-      <retval declared_type='NSPanel*' type='@'/>
-    </method>
-    <method class_method='true' selector='uniqueSpellDocumentTag'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='unlearnWord:'>
-      <arg name='word' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='updateSpellingPanelWithGrammarString:detail:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='detail' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='updateSpellingPanelWithMisspelledWord:'>
-      <arg name='word' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSSplitView'>
-    <method selector='adjustSubviews'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='autosaveName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='dividerColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='dividerStyle'>
-      <retval declared_type='NSSplitViewDividerStyle' type='i' type64='q'/>
-    </method>
-    <method selector='dividerThickness'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='drawDividerInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isPaneSplitter'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSubviewCollapsed:'>
-      <arg name='subview' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isVertical'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='maxPossiblePositionOfDividerAtIndex:'>
-      <arg name='dividerIndex' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='minPossiblePositionOfDividerAtIndex:'>
-      <arg name='dividerIndex' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='setAutosaveName:'>
-      <arg name='autosaveName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDividerStyle:'>
-      <arg name='dividerStyle' declared_type='NSSplitViewDividerStyle' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIsPaneSplitter:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPosition:ofDividerAtIndex:'>
-      <arg name='position' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='dividerIndex' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVertical:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSStatusBar'>
-    <method selector='isVertical'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='removeStatusItem:'>
-      <arg name='item' declared_type='NSStatusItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='statusItemWithLength:'>
-      <arg name='length' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='NSStatusItem*' type='@'/>
-    </method>
-    <method class_method='true' selector='systemStatusBar'>
-      <retval declared_type='NSStatusBar*' type='@'/>
-    </method>
-    <method selector='thickness'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-  </class>
-  <class name='NSStatusItem'>
-    <method selector='action'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='alternateImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='attributedTitle'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='doubleAction'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='drawStatusBarBackgroundInRect:withHighlight:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='highlight' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='highlightMode'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='isEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='menu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='popUpStatusItemMenu:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sendActionOn:'>
-      <arg name='mask' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setAction:'>
-      <arg name='action' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlternateImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedTitle:'>
-      <arg name='title' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDoubleAction:'>
-      <arg name='action' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEnabled:'>
-      <arg name='enabled' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHighlightMode:'>
-      <arg name='highlightMode' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLength:'>
-      <arg name='length' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenu:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTarget:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setToolTip:'>
-      <arg name='toolTip' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='statusBar'>
-      <retval declared_type='NSStatusBar*' type='@'/>
-    </method>
-    <method selector='target'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='toolTip'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='view'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-  </class>
-  <class name='NSStepper'>
-    <method selector='autorepeat'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='increment'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='maxValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='minValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='setAutorepeat:'>
-      <arg name='autorepeat' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIncrement:'>
-      <arg name='increment' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxValue:'>
-      <arg name='maxValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinValue:'>
-      <arg name='minValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValueWraps:'>
-      <arg name='valueWraps' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='valueWraps'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSStepperCell'>
-    <method selector='autorepeat'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='increment'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='maxValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='minValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='setAutorepeat:'>
-      <arg name='autorepeat' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIncrement:'>
-      <arg name='increment' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxValue:'>
-      <arg name='maxValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinValue:'>
-      <arg name='minValue' declared_type='double' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValueWraps:'>
-      <arg name='valueWraps' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='valueWraps'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSString'>
-    <method selector='boundingRectWithSize:options:attributes:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <arg name='options' declared_type='NSStringDrawingOptions' type='i' type64='q' index='1'/>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='drawAtPoint:withAttributes:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawInRect:withAttributes:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawWithRect:options:attributes:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='options' declared_type='NSStringDrawingOptions' type='i' type64='q' index='1'/>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sizeWithAttributes:'>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-  </class>
-  <class name='NSTabView'>
-    <method selector='addTabViewItem:'>
-      <arg name='tabViewItem' declared_type='NSTabViewItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='allowsTruncatedLabels'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='contentRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='controlSize'>
-      <retval declared_type='NSControlSize' type='I' type64='Q'/>
-    </method>
-    <method selector='controlTint'>
-      <retval declared_type='NSControlTint' type='I' type64='Q'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='drawsBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='font'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='indexOfTabViewItem:'>
-      <arg name='tabViewItem' declared_type='NSTabViewItem*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='indexOfTabViewItemWithIdentifier:'>
-      <arg name='identifier' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='insertTabViewItem:atIndex:'>
-      <arg name='tabViewItem' declared_type='NSTabViewItem*' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='minimumSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='numberOfTabViewItems'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='removeTabViewItem:'>
-      <arg name='tabViewItem' declared_type='NSTabViewItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectFirstTabViewItem:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectLastTabViewItem:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectNextTabViewItem:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectPreviousTabViewItem:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectTabViewItem:'>
-      <arg name='tabViewItem' declared_type='NSTabViewItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectTabViewItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectTabViewItemWithIdentifier:'>
-      <arg name='identifier' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedTabViewItem'>
-      <retval declared_type='NSTabViewItem*' type='@'/>
-    </method>
-    <method selector='setAllowsTruncatedLabels:'>
-      <arg name='allowTruncatedLabels' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setControlSize:'>
-      <arg name='controlSize' declared_type='NSControlSize' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setControlTint:'>
-      <arg name='controlTint' declared_type='NSControlTint' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsBackground:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFont:'>
-      <arg name='font' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTabViewType:'>
-      <arg name='tabViewType' declared_type='NSTabViewType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tabViewItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSTabViewItem*' type='@'/>
-    </method>
-    <method selector='tabViewItemAtPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSTabViewItem*' type='@'/>
-    </method>
-    <method selector='tabViewItems'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='tabViewType'>
-      <retval declared_type='NSTabViewType' type='I' type64='Q'/>
-    </method>
-    <method selector='takeSelectedTabViewItemFromSender:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSTabViewItem'>
-    <method selector='color'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='drawLabel:inRect:'>
-      <arg name='shouldTruncateLabel' declared_type='BOOL' type='B' index='0'/>
-      <arg name='labelRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='identifier'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithIdentifier:'>
-      <arg name='identifier' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initialFirstResponder'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='label'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIdentifier:'>
-      <arg name='identifier' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setInitialFirstResponder:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLabel:'>
-      <arg name='label' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sizeOfLabel:'>
-      <arg name='computeMin' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='tabState'>
-      <retval declared_type='NSTabState' type='I' type64='Q'/>
-    </method>
-    <method selector='tabView'>
-      <retval declared_type='NSTabView*' type='@'/>
-    </method>
-    <method selector='view'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSTableColumn'>
-    <method selector='dataCell'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='dataCellForRow:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='headerCell'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='headerToolTip'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='identifier'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithIdentifier:'>
-      <arg name='identifier' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isEditable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isHidden'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isResizable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='maxWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='minWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='resizingMask'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='setDataCell:'>
-      <arg name='cell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEditable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHeaderCell:'>
-      <arg name='cell' declared_type='NSCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHeaderToolTip:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHidden:'>
-      <arg name='hidden' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIdentifier:'>
-      <arg name='identifier' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxWidth:'>
-      <arg name='maxWidth' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinWidth:'>
-      <arg name='minWidth' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setResizable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setResizingMask:'>
-      <arg name='resizingMask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSortDescriptorPrototype:'>
-      <arg name='sortDescriptor' declared_type='NSSortDescriptor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTableView:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWidth:'>
-      <arg name='width' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sizeToFit'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sortDescriptorPrototype'>
-      <retval declared_type='NSSortDescriptor*' type='@'/>
-    </method>
-    <method selector='tableView'>
-      <retval declared_type='NSTableView*' type='@'/>
-    </method>
-    <method selector='width'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-  </class>
-  <class name='NSTableHeaderCell'>
-    <method selector='drawSortIndicatorWithFrame:inView:ascending:priority:'>
-      <arg name='cellFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <arg name='ascending' declared_type='BOOL' type='B' index='2'/>
-      <arg name='priority' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sortIndicatorRectForBounds:'>
-      <arg name='theRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-  </class>
-  <class name='NSTableHeaderView'>
-    <method selector='columnAtPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='draggedColumn'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='draggedDistance'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='headerRectOfColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='resizedColumn'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setTableView:'>
-      <arg name='tableView' declared_type='NSTableView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tableView'>
-      <retval declared_type='NSTableView*' type='@'/>
-    </method>
-  </class>
-  <class name='NSTableView'>
-    <method selector='addTableColumn:'>
-      <arg name='column' declared_type='NSTableColumn*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='allowsColumnReordering'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsColumnResizing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsColumnSelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsEmptySelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsMultipleSelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsTypeSelect'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='autoresizesAllColumnsToFit'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='autosaveName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='autosaveTableColumns'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='canDragRowsWithIndexes:atPoint:'>
-      <arg name='rowIndexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <arg name='mouseDownPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='clickedColumn'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='clickedRow'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='columnAtPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='columnAutoresizingStyle'>
-      <retval declared_type='NSTableViewColumnAutoresizingStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='columnIndexesInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSIndexSet*' type='@'/>
-    </method>
-    <method selector='columnWithIdentifier:'>
-      <arg name='identifier' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='columnsInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='cornerView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='dataSource'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='deselectAll:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deselectColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deselectRow:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='doubleAction'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='dragImageForRows:event:dragImageOffset:'>
-      <arg name='dragRows' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='dragEvent' declared_type='NSEvent*' type='@' index='1'/>
-      <arg name='dragImageOffset' declared_type='NSPointPointer' type='^{_NSPoint=ff}' type64='^{CGPoint=dd}' index='2'/>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='dragImageForRowsWithIndexes:tableColumns:event:offset:'>
-      <arg name='dragRows' declared_type='NSIndexSet*' type='@' index='0'/>
-      <arg name='tableColumns' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='dragEvent' declared_type='NSEvent*' type='@' index='2'/>
-      <arg name='dragImageOffset' declared_type='NSPointPointer' type='^{_NSPoint=ff}' type64='^{CGPoint=dd}' index='3'/>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='drawBackgroundInClipRect:'>
-      <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawGridInClipRect:'>
-      <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawRow:clipRect:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawsGrid'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='editColumn:row:withEvent:select:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='2'/>
-      <arg name='select' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='editedColumn'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='editedRow'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='frameOfCellAtColumn:row:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='gridColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='gridStyleMask'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='headerView'>
-      <retval declared_type='NSTableHeaderView*' type='@'/>
-    </method>
-    <method selector='highlightSelectionInClipRect:'>
-      <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='highlightedTableColumn'>
-      <retval declared_type='NSTableColumn*' type='@'/>
-    </method>
-    <method selector='indicatorImageInTableColumn:'>
-      <arg name='tc' declared_type='NSTableColumn*' type='@' index='0'/>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='intercellSpacing'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='isColumnSelected:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isRowSelected:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='moveColumn:toColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='newIndex' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='noteHeightOfRowsWithIndexesChanged:'>
-      <arg name='indexSet' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='noteNumberOfRowsChanged'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='numberOfColumns'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='numberOfRows'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='numberOfSelectedColumns'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='numberOfSelectedRows'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='preparedCellAtColumn:row:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='NSCell*' type='@'/>
-    </method>
-    <method selector='rectOfColumn:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='rectOfRow:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='reloadData'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeTableColumn:'>
-      <arg name='column' declared_type='NSTableColumn*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rowAtPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='rowHeight'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='rowsInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='scrollColumnToVisible:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollRowToVisible:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectAll:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectColumn:byExtendingSelection:'>
-      <arg name='column' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='extend' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectColumnIndexes:byExtendingSelection:'>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <arg name='extend' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectRow:byExtendingSelection:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='extend' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectRowIndexes:byExtendingSelection:'>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <arg name='extend' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedColumn'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='selectedColumnEnumerator'>
-      <retval declared_type='NSEnumerator*' type='@'/>
-    </method>
-    <method selector='selectedColumnIndexes'>
-      <retval declared_type='NSIndexSet*' type='@'/>
-    </method>
-    <method selector='selectedRow'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='selectedRowEnumerator'>
-      <retval declared_type='NSEnumerator*' type='@'/>
-    </method>
-    <method selector='selectedRowIndexes'>
-      <retval declared_type='NSIndexSet*' type='@'/>
-    </method>
-    <method selector='selectionHighlightStyle'>
-      <retval declared_type='NSTableViewSelectionHighlightStyle' type='i' type64='q'/>
-    </method>
-    <method selector='setAllowsColumnReordering:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsColumnResizing:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsColumnSelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsEmptySelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsMultipleSelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsTypeSelect:'>
-      <arg name='value' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutoresizesAllColumnsToFit:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutosaveName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutosaveTableColumns:'>
-      <arg name='save' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setColumnAutoresizingStyle:'>
-      <arg name='style' declared_type='NSTableViewColumnAutoresizingStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCornerView:'>
-      <arg name='cornerView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDataSource:'>
-      <arg name='aSource' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDoubleAction:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDraggingSourceOperationMask:forLocal:'>
-      <arg name='mask' declared_type='NSDragOperation' type='I' type64='Q' index='0'/>
-      <arg name='isLocal' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsGrid:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDropRow:dropOperation:'>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='op' declared_type='NSTableViewDropOperation' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGridColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGridStyleMask:'>
-      <arg name='gridType' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHeaderView:'>
-      <arg name='headerView' declared_type='NSTableHeaderView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHighlightedTableColumn:'>
-      <arg name='tc' declared_type='NSTableColumn*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIndicatorImage:inTableColumn:'>
-      <arg name='anImage' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='tc' declared_type='NSTableColumn*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIntercellSpacing:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRowHeight:'>
-      <arg name='rowHeight' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectionHighlightStyle:'>
-      <arg name='selectionHighlightStyle' declared_type='NSTableViewSelectionHighlightStyle' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSortDescriptors:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesAlternatingRowBackgroundColors:'>
-      <arg name='useAlternatingRowColors' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVerticalMotionCanBeginDrag:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sizeLastColumnToFit'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sizeToFit'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sortDescriptors'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='tableColumnWithIdentifier:'>
-      <arg name='identifier' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSTableColumn*' type='@'/>
-    </method>
-    <method selector='tableColumns'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='textDidBeginEditing:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textDidChange:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textDidEndEditing:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textShouldBeginEditing:'>
-      <arg name='textObject' declared_type='NSText*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='textShouldEndEditing:'>
-      <arg name='textObject' declared_type='NSText*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tile'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='usesAlternatingRowBackgroundColors'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='verticalMotionCanBeginDrag'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSText'>
-    <method selector='RTFDFromRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='RTFFromRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='alignCenter:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='alignLeft:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='alignRight:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='alignment'>
-      <retval declared_type='NSTextAlignment' type='I' type64='Q'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='baseWritingDirection'>
-      <retval declared_type='NSWritingDirection' type='i' type64='q'/>
-    </method>
-    <method selector='changeFont:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='checkSpelling:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='copy:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='copyFont:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='copyRuler:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='cut:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='delete:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawsBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='font'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='importsGraphics'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEditable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isFieldEditor'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isHorizontallyResizable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isRichText'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isRulerVisible'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSelectable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isVerticallyResizable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='maxSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='minSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='paste:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pasteFont:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pasteRuler:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='readRTFDFromFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='replaceCharactersInRange:withRTF:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='rtfData' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceCharactersInRange:withRTFD:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='rtfdData' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceCharactersInRange:withString:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='aString' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollRangeToVisible:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectAll:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedRange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='setAlignment:'>
-      <arg name='mode' declared_type='NSTextAlignment' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBaseWritingDirection:'>
-      <arg name='writingDirection' declared_type='NSWritingDirection' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsBackground:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEditable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFieldEditor:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFont:'>
-      <arg name='obj' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFont:range:'>
-      <arg name='font' declared_type='NSFont*' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHorizontallyResizable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImportsGraphics:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxSize:'>
-      <arg name='newMaxSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinSize:'>
-      <arg name='newMinSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRichText:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextColor:range:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesFontPanel:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVerticallyResizable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showGuessPanel:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sizeToFit'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='string'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='subscript:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='superscript:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='toggleRuler:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='underline:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='unscript:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='usesFontPanel'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeRTFDToFile:atomically:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSTextAttachment'>
-    <method selector='attachmentCell'>
-      <retval declared_type='id &lt;NSTextAttachmentCell&gt;' type='@'/>
-    </method>
-    <method selector='fileWrapper'>
-      <retval declared_type='NSFileWrapper*' type='@'/>
-    </method>
-    <method selector='initWithFileWrapper:'>
-      <arg name='fileWrapper' declared_type='NSFileWrapper*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setAttachmentCell:'>
-      <arg name='cell' declared_type='id &lt;NSTextAttachmentCell&gt;' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFileWrapper:'>
-      <arg name='fileWrapper' declared_type='NSFileWrapper*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSTextBlock'>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='borderColorForEdge:'>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='0'/>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='boundsRectForContentRect:inRect:textContainer:characterRange:'>
-      <arg name='contentRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='textContainer' declared_type='NSTextContainer*' type='@' index='2'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='contentWidth'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='contentWidthValueType'>
-      <retval declared_type='NSTextBlockValueType' type='I' type64='Q'/>
-    </method>
-    <method selector='drawBackgroundWithFrame:inView:characterRange:layoutManager:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='1'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <arg name='layoutManager' declared_type='NSLayoutManager*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='rectForLayoutAtPoint:inRect:textContainer:characterRange:'>
-      <arg name='startingPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='textContainer' declared_type='NSTextContainer*' type='@' index='2'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderColor:forEdge:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentWidth:type:'>
-      <arg name='val' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='type' declared_type='NSTextBlockValueType' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValue:type:forDimension:'>
-      <arg name='val' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='type' declared_type='NSTextBlockValueType' type='I' type64='Q' index='1'/>
-      <arg name='dimension' declared_type='NSTextBlockDimension' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVerticalAlignment:'>
-      <arg name='alignment' declared_type='NSTextBlockVerticalAlignment' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWidth:type:forLayer:'>
-      <arg name='val' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='type' declared_type='NSTextBlockValueType' type='I' type64='Q' index='1'/>
-      <arg name='layer' declared_type='NSTextBlockLayer' type='i' type64='q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWidth:type:forLayer:edge:'>
-      <arg name='val' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='type' declared_type='NSTextBlockValueType' type='I' type64='Q' index='1'/>
-      <arg name='layer' declared_type='NSTextBlockLayer' type='i' type64='q' index='2'/>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='valueForDimension:'>
-      <arg name='dimension' declared_type='NSTextBlockDimension' type='I' type64='Q' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='valueTypeForDimension:'>
-      <arg name='dimension' declared_type='NSTextBlockDimension' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSTextBlockValueType' type='I' type64='Q'/>
-    </method>
-    <method selector='verticalAlignment'>
-      <retval declared_type='NSTextBlockVerticalAlignment' type='I' type64='Q'/>
-    </method>
-    <method selector='widthForLayer:edge:'>
-      <arg name='layer' declared_type='NSTextBlockLayer' type='i' type64='q' index='0'/>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='1'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='widthValueTypeForLayer:edge:'>
-      <arg name='layer' declared_type='NSTextBlockLayer' type='i' type64='q' index='0'/>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='1'/>
-      <retval declared_type='NSTextBlockValueType' type='I' type64='Q'/>
-    </method>
-  </class>
-  <class name='NSTextContainer'>
-    <method selector='containerSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='containsPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='heightTracksTextView'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initWithContainerSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isSimpleRectangularTextContainer'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='layoutManager'>
-      <retval declared_type='NSLayoutManager*' type='@'/>
-    </method>
-    <method selector='lineFragmentPadding'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='lineFragmentRectForProposedRect:sweepDirection:movementDirection:remainingRect:'>
-      <arg name='proposedRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='sweepDirection' declared_type='NSLineSweepDirection' type='I' type64='Q' index='1'/>
-      <arg name='movementDirection' declared_type='NSLineMovementDirection' type='I' type64='Q' index='2'/>
-      <arg name='remainingRect' declared_type='NSRectPointer' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='3'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='replaceLayoutManager:'>
-      <arg name='newLayoutManager' declared_type='NSLayoutManager*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContainerSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHeightTracksTextView:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLayoutManager:'>
-      <arg name='layoutManager' declared_type='NSLayoutManager*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineFragmentPadding:'>
-      <arg name='pad' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextView:'>
-      <arg name='textView' declared_type='NSTextView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWidthTracksTextView:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textView'>
-      <retval declared_type='NSTextView*' type='@'/>
-    </method>
-    <method selector='widthTracksTextView'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSTextField'>
-    <method selector='acceptsFirstResponder'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsEditingTextAttributes'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='bezelStyle'>
-      <retval declared_type='NSTextFieldBezelStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='drawsBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='importsGraphics'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isBezeled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isBordered'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEditable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSelectable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectText:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsEditingTextAttributes:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBezelStyle:'>
-      <arg name='style' declared_type='NSTextFieldBezelStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBezeled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBordered:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsBackground:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEditable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImportsGraphics:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleWithMnemonic:'>
-      <arg name='stringWithAmpersand' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='textDidBeginEditing:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textDidChange:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textDidEndEditing:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textShouldBeginEditing:'>
-      <arg name='textObject' declared_type='NSText*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='textShouldEndEditing:'>
-      <arg name='textObject' declared_type='NSText*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSTextFieldCell'>
-    <method selector='allowedInputSourceLocales'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='bezelStyle'>
-      <retval declared_type='NSTextFieldBezelStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='drawsBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='placeholderAttributedString'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='placeholderString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setAllowedInputSourceLocales:'>
-      <arg name='localeIdentifiers' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBezelStyle:'>
-      <arg name='style' declared_type='NSTextFieldBezelStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsBackground:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPlaceholderAttributedString:'>
-      <arg name='string' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPlaceholderString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUpFieldEditorAttributes:'>
-      <arg name='textObj' declared_type='NSText*' type='@' index='0'/>
-      <retval declared_type='NSText*' type='@'/>
-    </method>
-    <method selector='setWantsNotificationForMarkedText:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-  </class>
-  <class name='NSTextList'>
-    <method selector='initWithMarkerFormat:options:'>
-      <arg name='format' declared_type='NSString*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='listOptions'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='markerForItemNumber:'>
-      <arg name='itemNum' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='markerFormat'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSTextStorage'>
-    <method selector='addLayoutManager:'>
-      <arg name='obj' declared_type='NSLayoutManager*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='attributeRuns'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='changeInLength'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='characters'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='edited:range:changeInLength:'>
-      <arg name='editedMask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='delta' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='editedMask'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='editedRange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='ensureAttributesAreFixedInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='fixesAttributesLazily'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='font'>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='foregroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='invalidateAttributesInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='layoutManagers'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='paragraphs'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='processEditing'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeLayoutManager:'>
-      <arg name='obj' declared_type='NSLayoutManager*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributeRuns:'>
-      <arg name='attributeRuns' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCharacters:'>
-      <arg name='characters' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFont:'>
-      <arg name='font' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setForegroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setParagraphs:'>
-      <arg name='paragraphs' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWords:'>
-      <arg name='words' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='words'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSTextTab'>
-    <method selector='alignment'>
-      <retval declared_type='NSTextAlignment' type='I' type64='Q'/>
-    </method>
-    <method selector='initWithTextAlignment:location:options:'>
-      <arg name='alignment' declared_type='NSTextAlignment' type='I' type64='Q' index='0'/>
-      <arg name='loc' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='options' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithType:location:'>
-      <arg name='type' declared_type='NSTextTabType' type='I' type64='Q' index='0'/>
-      <arg name='loc' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='location'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='options'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='tabStopType'>
-      <retval declared_type='NSTextTabType' type='I' type64='Q'/>
-    </method>
-  </class>
-  <class name='NSTextTable'>
-    <method selector='boundsRectForBlock:contentRect:inRect:textContainer:characterRange:'>
-      <arg name='block' declared_type='NSTextTableBlock*' type='@' index='0'/>
-      <arg name='contentRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='textContainer' declared_type='NSTextContainer*' type='@' index='3'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='4'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='collapsesBorders'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='drawBackgroundForBlock:withFrame:inView:characterRange:layoutManager:'>
-      <arg name='block' declared_type='NSTextTableBlock*' type='@' index='0'/>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='controlView' declared_type='NSView*' type='@' index='2'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <arg name='layoutManager' declared_type='NSLayoutManager*' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='hidesEmptyCells'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='layoutAlgorithm'>
-      <retval declared_type='NSTextTableLayoutAlgorithm' type='I' type64='Q'/>
-    </method>
-    <method selector='numberOfColumns'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='rectForBlock:layoutAtPoint:inRect:textContainer:characterRange:'>
-      <arg name='block' declared_type='NSTextTableBlock*' type='@' index='0'/>
-      <arg name='startingPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='textContainer' declared_type='NSTextContainer*' type='@' index='3'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='4'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='setCollapsesBorders:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHidesEmptyCells:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLayoutAlgorithm:'>
-      <arg name='algorithm' declared_type='NSTextTableLayoutAlgorithm' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNumberOfColumns:'>
-      <arg name='numCols' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSTextTableBlock'>
-    <method selector='columnSpan'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='initWithTable:startingRow:rowSpan:startingColumn:columnSpan:'>
-      <arg name='table' declared_type='NSTextTable*' type='@' index='0'/>
-      <arg name='row' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='rowSpan' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='col' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <arg name='colSpan' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='rowSpan'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='startingColumn'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='startingRow'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='table'>
-      <retval declared_type='NSTextTable*' type='@'/>
-    </method>
-  </class>
-  <class name='NSTextView'>
-    <method selector='acceptableDragTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='acceptsGlyphInfo'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='alignJustified:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='allowedInputSourceLocales'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='allowsDocumentBackgroundColorChange'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsImageEditing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsUndo'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='breakUndoCoalescing'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='changeAttributes:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='changeColor:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='changeDocumentBackgroundColor:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='characterIndexForInsertionAtPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='cleanUpAfterDragOperation'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='clickedOnLink:atIndex:'>
-      <arg name='link' declared_type='id' type='@' index='0'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='complete:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='completionsForPartialWordRange:indexOfSelectedItem:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='index' declared_type='NSInteger*' type='^i' type64='^q' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='defaultParagraphStyle'>
-      <retval declared_type='NSParagraphStyle*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='didChangeText'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='displaysLinkToolTips'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='dragImageForSelectionWithEvent:origin:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='origin' declared_type='NSPointPointer' type='^{_NSPoint=ff}' type64='^{CGPoint=dd}' index='1'/>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='dragOperationForDraggingInfo:type:'>
-      <arg name='dragInfo' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSDragOperation' type='I' type64='Q'/>
-    </method>
-    <method selector='dragSelectionWithEvent:offset:slideBack:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='mouseOffset' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='1'/>
-      <arg name='slideBack' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='drawInsertionPointInRect:color:turnedOn:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='color' declared_type='NSColor*' type='@' index='1'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawViewBackgroundInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawsBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='importsGraphics'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initWithFrame:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithFrame:textContainer:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertCompletion:forPartialWordRange:movement:isFinal:'>
-      <arg name='word' declared_type='NSString*' type='@' index='0'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='movement' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertText:'>
-      <arg name='insertString' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertionPointColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='invalidateTextContainerOrigin'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isAutomaticLinkDetectionEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isAutomaticQuoteSubstitutionEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isContinuousSpellCheckingEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEditable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isFieldEditor'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isGrammarCheckingEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isRichText'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isRulerVisible'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSelectable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='layoutManager'>
-      <retval declared_type='NSLayoutManager*' type='@'/>
-    </method>
-    <method selector='linkTextAttributes'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='loosenKerning:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='lowerBaseline:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='markedTextAttributes'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='orderFrontLinkPanel:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderFrontListPanel:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderFrontSpacingPanel:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderFrontTablePanel:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='outline:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pasteAsPlainText:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pasteAsRichText:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performFindPanelAction:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='preferredPasteboardTypeFromArray:restrictedToTypesFromArray:'>
-      <arg name='availableTypes' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='allowedTypes' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='raiseBaseline:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rangeForUserCharacterAttributeChange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeForUserCompletion'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeForUserParagraphAttributeChange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeForUserTextChange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangesForUserCharacterAttributeChange'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='rangesForUserParagraphAttributeChange'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='rangesForUserTextChange'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='readSelectionFromPasteboard:'>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='readSelectionFromPasteboard:type:'>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='readablePasteboardTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='registerForServices'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceTextContainer:'>
-      <arg name='newContainer' declared_type='NSTextContainer*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rulerView:didAddMarker:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rulerView:didMoveMarker:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rulerView:didRemoveMarker:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rulerView:handleMouseDown:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rulerView:shouldAddMarker:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rulerView:shouldMoveMarker:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rulerView:shouldRemoveMarker:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rulerView:willAddMarker:atLocation:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <arg name='location' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='rulerView:willMoveMarker:toLocation:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <arg name='location' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='selectedRanges'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='selectedTextAttributes'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='selectionAffinity'>
-      <retval declared_type='NSSelectionAffinity' type='I' type64='Q'/>
-    </method>
-    <method selector='selectionGranularity'>
-      <retval declared_type='NSSelectionGranularity' type='I' type64='Q'/>
-    </method>
-    <method selector='selectionRangeForProposedRange:granularity:'>
-      <arg name='proposedCharRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='granularity' declared_type='NSSelectionGranularity' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='setAcceptsGlyphInfo:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlignment:range:'>
-      <arg name='alignment' declared_type='NSTextAlignment' type='I' type64='Q' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowedInputSourceLocales:'>
-      <arg name='localeIdentifiers' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsDocumentBackgroundColorChange:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsImageEditing:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsUndo:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutomaticLinkDetectionEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutomaticQuoteSubstitutionEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBaseWritingDirection:range:'>
-      <arg name='writingDirection' declared_type='NSWritingDirection' type='i' type64='q' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setConstrainedFrameSize:'>
-      <arg name='desiredSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContinuousSpellCheckingEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDefaultParagraphStyle:'>
-      <arg name='paragraphStyle' declared_type='NSParagraphStyle*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDisplaysLinkToolTips:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsBackground:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEditable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFieldEditor:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGrammarCheckingEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImportsGraphics:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setInsertionPointColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLinkTextAttributes:'>
-      <arg name='attributeDictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMarkedTextAttributes:'>
-      <arg name='attributeDictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNeedsDisplayInRect:avoidAdditionalLayout:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRichText:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRulerVisible:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedRange:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedRange:affinity:stillSelecting:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='affinity' declared_type='NSSelectionAffinity' type='I' type64='Q' index='1'/>
-      <arg name='stillSelectingFlag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedRanges:'>
-      <arg name='ranges' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedRanges:affinity:stillSelecting:'>
-      <arg name='ranges' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='affinity' declared_type='NSSelectionAffinity' type='I' type64='Q' index='1'/>
-      <arg name='stillSelectingFlag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedTextAttributes:'>
-      <arg name='attributeDictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectionGranularity:'>
-      <arg name='granularity' declared_type='NSSelectionGranularity' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSmartInsertDeleteEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSpellingState:range:'>
-      <arg name='value' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextContainer:'>
-      <arg name='container' declared_type='NSTextContainer*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextContainerInset:'>
-      <arg name='inset' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTypingAttributes:'>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesFindPanel:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesFontPanel:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesRuler:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shouldChangeTextInRange:replacementString:'>
-      <arg name='affectedCharRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='replacementString' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='shouldChangeTextInRanges:replacementStrings:'>
-      <arg name='affectedRanges' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='replacementStrings' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='shouldDrawInsertionPoint'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='showFindIndicatorForRange:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='smartDeleteRangeForProposedRange:'>
-      <arg name='proposedCharRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='smartInsertAfterStringForString:replacingRange:'>
-      <arg name='pasteString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='charRangeToReplace' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='smartInsertBeforeStringForString:replacingRange:'>
-      <arg name='pasteString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='charRangeToReplace' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='smartInsertDeleteEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='smartInsertForString:replacingRange:beforeString:afterString:'>
-      <arg name='pasteString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='charRangeToReplace' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='beforeString' declared_type='NSString**' type='^@' index='2'/>
-      <arg name='afterString' declared_type='NSString**' type='^@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='spellCheckerDocumentTag'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='startSpeaking:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopSpeaking:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textContainer'>
-      <retval declared_type='NSTextContainer*' type='@'/>
-    </method>
-    <method selector='textContainerInset'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='textContainerOrigin'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='textStorage'>
-      <retval declared_type='NSTextStorage*' type='@'/>
-    </method>
-    <method selector='tightenKerning:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toggleAutomaticLinkDetection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toggleAutomaticQuoteSubstitution:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toggleBaseWritingDirection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toggleContinuousSpellChecking:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toggleGrammarChecking:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toggleSmartInsertDelete:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toggleTraditionalCharacterShape:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='turnOffKerning:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='turnOffLigatures:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='typingAttributes'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='updateDragTypeRegistration'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='updateFontPanel'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='updateInsertionPointStateAndRestartTimer:'>
-      <arg name='restartFlag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='updateRuler'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='useAllLigatures:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='useStandardKerning:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='useStandardLigatures:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='usesFindPanel'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='usesFontPanel'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='usesRuler'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='validRequestorForSendType:returnType:'>
-      <arg name='sendType' declared_type='NSString*' type='@' index='0'/>
-      <arg name='returnType' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='writablePasteboardTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='writeSelectionToPasteboard:type:'>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeSelectionToPasteboard:types:'>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <arg name='types' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSTokenField'>
-    <method selector='completionDelay'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method class_method='true' selector='defaultCompletionDelay'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method class_method='true' selector='defaultTokenizingCharacterSet'>
-      <retval declared_type='NSCharacterSet*' type='@'/>
-    </method>
-    <method selector='setCompletionDelay:'>
-      <arg name='delay' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTokenStyle:'>
-      <arg name='style' declared_type='NSTokenStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTokenizingCharacterSet:'>
-      <arg name='characterSet' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tokenStyle'>
-      <retval declared_type='NSTokenStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='tokenizingCharacterSet'>
-      <retval declared_type='NSCharacterSet*' type='@'/>
-    </method>
-  </class>
-  <class name='NSTokenFieldCell'>
-    <method selector='completionDelay'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method class_method='true' selector='defaultCompletionDelay'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method class_method='true' selector='defaultTokenizingCharacterSet'>
-      <retval declared_type='NSCharacterSet*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setCompletionDelay:'>
-      <arg name='delay' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTokenStyle:'>
-      <arg name='style' declared_type='NSTokenStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTokenizingCharacterSet:'>
-      <arg name='characterSet' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tokenStyle'>
-      <retval declared_type='NSTokenStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='tokenizingCharacterSet'>
-      <retval declared_type='NSCharacterSet*' type='@'/>
-    </method>
-  </class>
-  <class name='NSToolbar'>
-    <method selector='allowsUserCustomization'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='autosavesConfiguration'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='configurationDictionary'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='customizationPaletteIsRunning'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='displayMode'>
-      <retval declared_type='NSToolbarDisplayMode' type='I' type64='Q'/>
-    </method>
-    <method selector='identifier'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='initWithIdentifier:'>
-      <arg name='identifier' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertItemWithItemIdentifier:atIndex:'>
-      <arg name='itemIdentifier' declared_type='NSString*' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isVisible'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='items'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='removeItemAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='runCustomizationPalette:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedItemIdentifier'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setAllowsUserCustomization:'>
-      <arg name='allowCustomization' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutosavesConfiguration:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setConfigurationFromDictionary:'>
-      <arg name='configDict' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDisplayMode:'>
-      <arg name='displayMode' declared_type='NSToolbarDisplayMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedItemIdentifier:'>
-      <arg name='itemIdentifier' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsBaselineSeparator:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSizeMode:'>
-      <arg name='sizeMode' declared_type='NSToolbarSizeMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVisible:'>
-      <arg name='shown' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='showsBaselineSeparator'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='sizeMode'>
-      <retval declared_type='NSToolbarSizeMode' type='I' type64='Q'/>
-    </method>
-    <method selector='validateVisibleItems'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='visibleItems'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSToolbarItem'>
-    <method selector='action'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='allowsDuplicatesInToolbar'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='autovalidates'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='initWithItemIdentifier:'>
-      <arg name='itemIdentifier' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='itemIdentifier'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='label'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='maxSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='menuFormRepresentation'>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='minSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='paletteLabel'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setAction:'>
-      <arg name='action' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutovalidates:'>
-      <arg name='resistance' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEnabled:'>
-      <arg name='enabled' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLabel:'>
-      <arg name='label' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMenuFormRepresentation:'>
-      <arg name='menuItem' declared_type='NSMenuItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPaletteLabel:'>
-      <arg name='paletteLabel' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTag:'>
-      <arg name='tag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTarget:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setToolTip:'>
-      <arg name='toolTip' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVisibilityPriority:'>
-      <arg name='visibilityPriority' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tag'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='target'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='toolTip'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='toolbar'>
-      <retval declared_type='NSToolbar*' type='@'/>
-    </method>
-    <method selector='validate'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='view'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='visibilityPriority'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-  </class>
-  <class name='NSToolbarItemGroup'>
-    <method selector='setSubitems:'>
-      <arg name='subitems' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='subitems'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSTrackingArea'>
-    <method selector='initWithRect:options:owner:userInfo:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='options' declared_type='NSTrackingAreaOptions' type='I' type64='Q' index='1'/>
-      <arg name='owner' declared_type='id' type='@' index='2'/>
-      <arg name='userInfo' declared_type='NSDictionary*' type='@' index='3'/>
-      <retval declared_type='NSTrackingArea*' type='@'/>
-    </method>
-    <method selector='options'>
-      <retval declared_type='NSTrackingAreaOptions' type='I' type64='Q'/>
-    </method>
-    <method selector='owner'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='rect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='userInfo'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-  </class>
-  <class name='NSTreeController'>
-    <method selector='add:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addChild:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addSelectionIndexPaths:'>
-      <arg name='indexPaths' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='alwaysUsesMultipleValuesMarker'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='arrangedObjects'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='avoidsEmptySelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canAddChild'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canInsert'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canInsertChild'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='childrenKeyPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='childrenKeyPathForNode:'>
-      <arg name='node' declared_type='NSTreeNode*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='content'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='countKeyPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='countKeyPathForNode:'>
-      <arg name='node' declared_type='NSTreeNode*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='insert:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertChild:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertObject:atArrangedObjectIndexPath:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <arg name='indexPath' declared_type='NSIndexPath*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertObjects:atArrangedObjectIndexPaths:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='indexPaths' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='leafKeyPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='leafKeyPathForNode:'>
-      <arg name='node' declared_type='NSTreeNode*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='moveNode:toIndexPath:'>
-      <arg name='node' declared_type='NSTreeNode*' type='@' index='0'/>
-      <arg name='indexPath' declared_type='NSIndexPath*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveNodes:toIndexPath:'>
-      <arg name='nodes' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='startingIndexPath' declared_type='NSIndexPath*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='preservesSelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rearrangeObjects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='remove:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectAtArrangedObjectIndexPath:'>
-      <arg name='indexPath' declared_type='NSIndexPath*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectsAtArrangedObjectIndexPaths:'>
-      <arg name='indexPaths' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeSelectionIndexPaths:'>
-      <arg name='indexPaths' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectedNodes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='selectedObjects'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='selectionIndexPath'>
-      <retval declared_type='NSIndexPath*' type='@'/>
-    </method>
-    <method selector='selectionIndexPaths'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='selectsInsertedObjects'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAlwaysUsesMultipleValuesMarker:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAvoidsEmptySelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setChildrenKeyPath:'>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContent:'>
-      <arg name='content' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCountKeyPath:'>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLeafKeyPath:'>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPreservesSelection:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectionIndexPath:'>
-      <arg name='indexPath' declared_type='NSIndexPath*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setSelectionIndexPaths:'>
-      <arg name='indexPaths' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setSelectsInsertedObjects:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSortDescriptors:'>
-      <arg name='sortDescriptors' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sortDescriptors'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSTreeNode'>
-    <method selector='childNodes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='descendantNodeAtIndexPath:'>
-      <arg name='indexPath' declared_type='NSIndexPath*' type='@' index='0'/>
-      <retval declared_type='NSTreeNode*' type='@'/>
-    </method>
-    <method selector='indexPath'>
-      <retval declared_type='NSIndexPath*' type='@'/>
-    </method>
-    <method selector='initWithRepresentedObject:'>
-      <arg name='modelObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isLeaf'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='mutableChildNodes'>
-      <retval declared_type='NSMutableArray*' type='@'/>
-    </method>
-    <method selector='parentNode'>
-      <retval declared_type='NSTreeNode*' type='@'/>
-    </method>
-    <method selector='representedObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='sortWithSortDescriptors:recursively:'>
-      <arg name='sortDescriptors' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='recursively' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='treeNodeWithRepresentedObject:'>
-      <arg name='modelObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSTypesetter'>
-    <method selector='actionForControlCharacterAtIndex:'>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSTypesetterControlCharacterAction' type='I' type64='Q'/>
-    </method>
-    <method selector='attributedString'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='attributesForExtraLineFragment'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='baselineOffsetInLayoutManager:glyphIndex:'>
-      <arg name='layoutMgr' declared_type='NSLayoutManager*' type='@' index='0'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='beginLineWithGlyphAtIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='beginParagraph'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='bidiProcessingEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='boundingBoxForControlGlyphAtIndex:forTextContainer:proposedLineFragment:glyphPosition:characterIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='textContainer' declared_type='NSTextContainer*' type='@' index='1'/>
-      <arg name='proposedRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='glyphPosition' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='3'/>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='4'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='characterRangeForGlyphRange:actualGlyphRange:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='actualGlyphRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='currentParagraphStyle'>
-      <retval declared_type='NSParagraphStyle*' type='@'/>
-    </method>
-    <method selector='currentTextContainer'>
-      <retval declared_type='NSTextContainer*' type='@'/>
-    </method>
-    <method class_method='true' selector='defaultTypesetterBehavior'>
-      <retval declared_type='NSTypesetterBehavior' type='i' type64='q'/>
-    </method>
-    <method selector='deleteGlyphsInRange:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='endLineWithGlyphRange:'>
-      <arg name='lineGlyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='endParagraph'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method ignore='true' selector='getGlyphsInRange:glyphs:characterIndexes:glyphInscriptions:elasticBits:bidiLevels:'>
-      <arg name='glyphsRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='glyphBuffer' declared_type='NSGlyph*' type='^I' index='1'/>
-      <arg name='charIndexBuffer' declared_type='NSUInteger*' type='^I' type64='^Q' index='2'/>
-      <arg name='inscribeBuffer' declared_type='NSGlyphInscription*' type='^I' type64='^Q' index='3'/>
-      <arg name='elasticBuffer' declared_type='BOOL*' type='^B' index='4'/>
-      <arg name='bidiLevelBuffer' declared_type='unsigned char*' type='*' index='5'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='getLineFragmentRect:usedRect:forParagraphSeparatorGlyphRange:atProposedOrigin:'>
-      <arg name='lineFragmentRect' declared_type='NSRectPointer' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='lineFragmentUsedRect' declared_type='NSRectPointer' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='paragraphSeparatorGlyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <arg name='lineOrigin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getLineFragmentRect:usedRect:remainingRect:forStartingGlyphAtIndex:proposedRect:lineSpacing:paragraphSpacingBefore:paragraphSpacingAfter:'>
-      <arg name='lineFragmentRect' declared_type='NSRectPointer' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='lineFragmentUsedRect' declared_type='NSRectPointer' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='remainingRect' declared_type='NSRectPointer' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='startingGlyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <arg name='proposedRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='4'/>
-      <arg name='lineSpacing' declared_type='CGFloat' type='f' type64='d' index='5'/>
-      <arg name='paragraphSpacingBefore' declared_type='CGFloat' type='f' type64='d' index='6'/>
-      <arg name='paragraphSpacingAfter' declared_type='CGFloat' type='f' type64='d' index='7'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='glyphRangeForCharacterRange:actualCharacterRange:'>
-      <arg name='charRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='actualCharRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='hyphenCharacterForGlyphAtIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='UTF32Char' type='L' type64='I'/>
-    </method>
-    <method selector='hyphenationFactor'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='hyphenationFactorForGlyphAtIndex:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='insertGlyph:atGlyphIndex:characterIndex:'>
-      <arg name='glyph' declared_type='NSGlyph' type='I' index='0'/>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='characterIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='layoutCharactersInRange:forLayoutManager:maximumNumberOfLineFragments:'>
-      <arg name='characterRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='layoutManager' declared_type='NSLayoutManager*' type='@' index='1'/>
-      <arg name='maxNumLines' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='layoutGlyphsInLayoutManager:startingAtGlyphIndex:maxNumberOfLineFragments:nextGlyphIndex:'>
-      <arg name='layoutManager' declared_type='NSLayoutManager*' type='@' index='0'/>
-      <arg name='startGlyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='maxNumLines' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='nextGlyph' declared_type='NSUInteger*' type='^I' type64='^Q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='layoutManager'>
-      <retval declared_type='NSLayoutManager*' type='@'/>
-    </method>
-    <method selector='layoutParagraphAtPoint:'>
-      <arg name='lineFragmentOrigin' declared_type='NSPointPointer' type='^{_NSPoint=ff}' type64='^{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='lineFragmentPadding'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='lineSpacingAfterGlyphAtIndex:withProposedLineFragmentRect:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='paragraphCharacterRange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='paragraphGlyphRange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='paragraphSeparatorCharacterRange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='paragraphSeparatorGlyphRange'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='paragraphSpacingAfterGlyphAtIndex:withProposedLineFragmentRect:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='paragraphSpacingBeforeGlyphAtIndex:withProposedLineFragmentRect:'>
-      <arg name='glyphIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method class_method='true' selector='printingAdjustmentInLayoutManager:forNominallySpacedGlyphRange:packedGlyphs:count:'>
-      <arg name='layoutMgr' declared_type='NSLayoutManager*' type='@' index='0'/>
-      <arg name='nominallySpacedGlyphsRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='packedGlyphs' declared_type='unsigned char*' type='*' const='true' index='2'/>
-      <arg name='packedGlyphsCount' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='setAttachmentSize:forGlyphRange:'>
-      <arg name='attachmentSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedString:'>
-      <arg name='attrString' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBidiLevels:forGlyphRange:'>
-      <arg name='levels' declared_type='uint8_t*' type='*' const='true' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBidiProcessingEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsOutsideLineFragment:forGlyphRange:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHardInvalidation:forGlyphRange:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHyphenationFactor:'>
-      <arg name='factor' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineFragmentPadding:'>
-      <arg name='padding' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineFragmentRect:forGlyphRange:usedRect:baselineOffset:'>
-      <arg name='fragmentRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='usedRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='baselineOffset' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocation:withAdvancements:forStartOfGlyphRange:'>
-      <arg name='location' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='advancements' declared_type='CGFloat*' type='^f' type64='^d' const='true' index='1'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNotShownAttribute:forGlyphRange:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setParagraphGlyphRange:separatorGlyphRange:'>
-      <arg name='paragraphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='paragraphSeparatorRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTypesetterBehavior:'>
-      <arg name='behavior' declared_type='NSTypesetterBehavior' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesFontLeading:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedSystemTypesetter'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='sharedSystemTypesetterForBehavior:'>
-      <arg name='theBehavior' declared_type='NSTypesetterBehavior' type='i' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='shouldBreakLineByHyphenatingBeforeCharacterAtIndex:'>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='shouldBreakLineByWordBeforeCharacterAtIndex:'>
-      <arg name='charIndex' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='substituteFontForFont:'>
-      <arg name='originalFont' declared_type='NSFont*' type='@' index='0'/>
-      <retval declared_type='NSFont*' type='@'/>
-    </method>
-    <method selector='substituteGlyphsInRange:withGlyphs:'>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='glyphs' declared_type='NSGlyph*' type='^I' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textContainers'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='textTabForGlyphLocation:writingDirection:maxLocation:'>
-      <arg name='glyphLocation' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='direction' declared_type='NSWritingDirection' type='i' type64='q' index='1'/>
-      <arg name='maxLocation' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <retval declared_type='NSTextTab*' type='@'/>
-    </method>
-    <method selector='typesetterBehavior'>
-      <retval declared_type='NSTypesetterBehavior' type='i' type64='q'/>
-    </method>
-    <method selector='usesFontLeading'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='willSetLineFragmentRect:forGlyphRange:usedRect:baselineOffset:'>
-      <arg name='lineRect' declared_type='NSRectPointer' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='glyphRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='usedRect' declared_type='NSRectPointer' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='2'/>
-      <arg name='baselineOffset' declared_type='CGFloat*' type='^f' type64='^d' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSURL'>
-    <method class_method='true' selector='URLFromPasteboard:'>
-      <arg name='pasteBoard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='writeToPasteboard:'>
-      <arg name='pasteBoard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSUserDefaultsController'>
-    <method selector='appliesImmediately'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='defaults'>
-      <retval declared_type='NSUserDefaults*' type='@'/>
-    </method>
-    <method selector='hasUnappliedChanges'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initWithDefaults:initialValues:'>
-      <arg name='defaults' declared_type='NSUserDefaults*' type='@' index='0'/>
-      <arg name='initialValues' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initialValues'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='revert:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='revertToInitialValues:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='save:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAppliesImmediately:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setInitialValues:'>
-      <arg name='initialValues' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedUserDefaultsController'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='values'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSView'>
-    <method selector='acceptsFirstMouse:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='addCursorRect:cursor:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='anObj' declared_type='NSCursor*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addSubview:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addSubview:positioned:relativeTo:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <arg name='place' declared_type='NSWindowOrderingMode' type='i' type64='q' index='1'/>
-      <arg name='otherView' declared_type='NSView*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addToolTipRect:owner:userData:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <arg name='data' declared_type='void*' type='^v' index='2'/>
-      <retval declared_type='NSToolTipTag' type='i' type64='q'/>
-    </method>
-    <method selector='addTrackingArea:'>
-      <arg name='trackingArea' declared_type='NSTrackingArea*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addTrackingRect:owner:userData:assumeInside:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <arg name='data' declared_type='void*' type='^v' index='2'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='NSTrackingRectTag' type='i' type64='q'/>
-    </method>
-    <method selector='adjustPageHeightNew:top:bottom:limit:'>
-      <arg name='newBottom' declared_type='CGFloat*' type='^f' type64='^d' index='0'/>
-      <arg name='oldTop' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='oldBottom' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <arg name='bottomLimit' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='adjustPageWidthNew:left:right:limit:'>
-      <arg name='newRight' declared_type='CGFloat*' type='^f' type64='^d' index='0'/>
-      <arg name='oldLeft' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <arg name='oldRight' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <arg name='rightLimit' declared_type='CGFloat' type='f' type64='d' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='adjustScroll:'>
-      <arg name='newVisible' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='allocateGState'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='alphaValue'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='ancestorSharedWithView:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='autoresizesSubviews'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='autoresizingMask'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='autoscroll:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='backgroundFilters'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='beginDocument'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='beginPageInRect:atPlacement:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='location' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='bitmapImageRepForCachingDisplayInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSBitmapImageRep*' type='@'/>
-    </method>
-    <method selector='bounds'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='boundsRotation'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='cacheDisplayInRect:toBitmapImageRep:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='bitmapImageRep' declared_type='NSBitmapImageRep*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='canBecomeKeyView'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canDraw'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='centerScanRect:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='compositingFilter'>
-      <retval declared_type='CIFilter*' type='@'/>
-    </method>
-    <method selector='contentFilters'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='convertPoint:fromView:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='aView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='convertPoint:toView:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='aView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='convertPointFromBase:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='convertPointToBase:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='convertRect:fromView:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='aView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='convertRect:toView:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='aView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='convertRectFromBase:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='convertRectToBase:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='convertSize:fromView:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <arg name='aView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='convertSize:toView:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <arg name='aView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='convertSizeFromBase:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='convertSizeToBase:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='dataWithEPSInsideRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='dataWithPDFInsideRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method class_method='true' selector='defaultFocusRingType'>
-      <retval declared_type='NSFocusRingType' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='defaultMenu'>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='didAddSubview:'>
-      <arg name='subview' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='discardCursorRects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='display'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='displayIfNeeded'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='displayIfNeededIgnoringOpacity'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='displayIfNeededInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='displayIfNeededInRectIgnoringOpacity:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='displayRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='displayRectIgnoringOpacity:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='displayRectIgnoringOpacity:inContext:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='context' declared_type='NSGraphicsContext*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='dragFile:fromRect:slideBack:event:'>
-      <arg name='filename' declared_type='NSString*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='aFlag' declared_type='BOOL' type='B' index='2'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='dragImage:at:offset:event:pasteboard:source:slideBack:'>
-      <arg name='anImage' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='viewLocation' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='initialOffset' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='2'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='3'/>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='4'/>
-      <arg name='sourceObj' declared_type='id' type='@' index='5'/>
-      <arg name='slideFlag' declared_type='BOOL' type='B' index='6'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='dragPromisedFilesOfTypes:fromRect:source:slideBack:event:'>
-      <arg name='typeArray' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <arg name='sourceObject' declared_type='id' type='@' index='2'/>
-      <arg name='aFlag' declared_type='BOOL' type='B' index='3'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='4'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='drawPageBorderWithSize:'>
-      <arg name='borderSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawSheetBorderWithSize:'>
-      <arg name='borderSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='enclosingMenuItem'>
-      <retval declared_type='NSMenuItem*' type='@'/>
-    </method>
-    <method selector='enclosingScrollView'>
-      <retval declared_type='NSScrollView*' type='@'/>
-    </method>
-    <method selector='endDocument'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='endPage'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='enterFullScreenMode:withOptions:'>
-      <arg name='screen' declared_type='NSScreen*' type='@' index='0'/>
-      <arg name='options' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='exitFullScreenModeWithOptions:'>
-      <arg name='options' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='focusRingType'>
-      <retval declared_type='NSFocusRingType' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='focusView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='frame'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='frameCenterRotation'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='frameRotation'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='gState'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='getRectsBeingDrawn:count:'>
-      <arg name='rects' declared_type='NSRect**' type='^^{_NSRect}' type64='^^{CGRect}' const='true' index='0'/>
-      <arg name='count' declared_type='NSInteger*' type='^i' type64='^q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getRectsExposedDuringLiveResize:count:'>
-      <arg name='exposedRects' declared_type='NSRect*' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='count' declared_type='NSInteger*' type='^i' type64='^q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='heightAdjustLimit'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='hitTest:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='inLiveResize'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initWithFrame:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isDescendantOf:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isFlipped'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isHidden'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isHiddenOrHasHiddenAncestor'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isInFullScreenMode'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isOpaque'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isRotatedFromBase'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isRotatedOrScaledFromBase'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='knowsPageRange:'>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='layer'>
-      <retval declared_type='CALayer*' type='@'/>
-    </method>
-    <method selector='locationOfPrintRect:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='lockFocus'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='lockFocusIfCanDraw'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='lockFocusIfCanDrawInContext:'>
-      <arg name='context' declared_type='NSGraphicsContext*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='menuForEvent:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='NSMenu*' type='@'/>
-    </method>
-    <method selector='mouse:inRect:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='mouseDownCanMoveWindow'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='needsDisplay'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='needsPanelToBecomeKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='needsToDrawRect:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='nextKeyView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='nextValidKeyView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='opaqueAncestor'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='pageFooter'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='pageHeader'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='performKeyEquivalent:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='performMnemonic:'>
-      <arg name='theString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='postsBoundsChangedNotifications'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='postsFrameChangedNotifications'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='preservesContentDuringLiveResize'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='previousKeyView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='previousValidKeyView'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='print:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='printJobTitle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='rectForPage:'>
-      <arg name='page' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='rectPreservedDuringLiveResize'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='reflectScrolledClipView:'>
-      <arg name='aClipView' declared_type='NSClipView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='registerForDraggedTypes:'>
-      <arg name='newTypes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='registeredDraggedTypes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='releaseGState'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAllToolTips'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeCursorRect:cursor:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='anObj' declared_type='NSCursor*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeFromSuperview'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeFromSuperviewWithoutNeedingDisplay'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeToolTip:'>
-      <arg name='tag' declared_type='NSToolTipTag' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeTrackingArea:'>
-      <arg name='trackingArea' declared_type='NSTrackingArea*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeTrackingRect:'>
-      <arg name='tag' declared_type='NSTrackingRectTag' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='renewGState'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceSubview:with:'>
-      <arg name='oldView' declared_type='NSView*' type='@' index='0'/>
-      <arg name='newView' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resetCursorRects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resizeSubviewsWithOldSize:'>
-      <arg name='oldSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resizeWithOldSuperviewSize:'>
-      <arg name='oldSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rotateByAngle:'>
-      <arg name='angle' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rulerView:didAddMarker:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rulerView:didMoveMarker:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rulerView:didRemoveMarker:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rulerView:handleMouseDown:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rulerView:shouldAddMarker:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rulerView:shouldMoveMarker:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rulerView:shouldRemoveMarker:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rulerView:willAddMarker:atLocation:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <arg name='location' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='rulerView:willMoveMarker:toLocation:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='marker' declared_type='NSRulerMarker*' type='@' index='1'/>
-      <arg name='location' declared_type='CGFloat' type='f' type64='d' index='2'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='rulerView:willSetClientView:'>
-      <arg name='ruler' declared_type='NSRulerView*' type='@' index='0'/>
-      <arg name='newClient' declared_type='NSView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scaleUnitSquareToSize:'>
-      <arg name='newUnitSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollClipView:toPoint:'>
-      <arg name='aClipView' declared_type='NSClipView*' type='@' index='0'/>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollPoint:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollRect:by:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='delta' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollRectToVisible:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAlphaValue:'>
-      <arg name='viewAlpha' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutoresizesSubviews:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutoresizingMask:'>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundFilters:'>
-      <arg name='filters' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBounds:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBoundsOrigin:'>
-      <arg name='newOrigin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBoundsRotation:'>
-      <arg name='angle' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBoundsSize:'>
-      <arg name='newSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCompositingFilter:'>
-      <arg name='filter' declared_type='CIFilter*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentFilters:'>
-      <arg name='filters' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFocusRingType:'>
-      <arg name='focusRingType' declared_type='NSFocusRingType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrame:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrameCenterRotation:'>
-      <arg name='angle' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrameOrigin:'>
-      <arg name='newOrigin' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrameRotation:'>
-      <arg name='angle' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrameSize:'>
-      <arg name='newSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHidden:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKeyboardFocusRingNeedsDisplayInRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLayer:'>
-      <arg name='newLayer' declared_type='CALayer*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNeedsDisplay:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNeedsDisplayInRect:'>
-      <arg name='invalidRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNextKeyView:'>
-      <arg name='next' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPostsBoundsChangedNotifications:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPostsFrameChangedNotifications:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShadow:'>
-      <arg name='shadow' declared_type='NSShadow*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSubviews:'>
-      <arg name='newSubviews' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setToolTip:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUpGState'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWantsLayer:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shadow'>
-      <retval declared_type='NSShadow*' type='@'/>
-    </method>
-    <method selector='shouldDelayWindowOrderingForEvent:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='shouldDrawColor'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='sortSubviewsUsingFunction:context:'>
-      <arg name='compare' function_pointer='true' declared_type='NSComparisonResult *id, id, void*' type='^?' index='0' type_modifier='n'>
-        <arg declared_type='id' type='@'/>
-        <arg declared_type='id' type='@'/>
-        <arg declared_type='void*' type='^v'/>
-        <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-      </arg>
-      <arg name='context' declared_type='void*' type='^v' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='subviews'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='superview'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='tag'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='toolTip'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='trackingAreas'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='translateOriginToPoint:'>
-      <arg name='translation' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='translateRectsNeedingDisplayInRect:by:'>
-      <arg name='clipRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='delta' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='unlockFocus'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='unregisterDraggedTypes'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='updateTrackingAreas'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewDidEndLiveResize'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewDidHide'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewDidMoveToSuperview'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewDidMoveToWindow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewDidUnhide'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewWillDraw'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewWillMoveToSuperview:'>
-      <arg name='newSuperview' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewWillMoveToWindow:'>
-      <arg name='newWindow' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewWillStartLiveResize'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewWithTag:'>
-      <arg name='aTag' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='visibleRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='wantsDefaultClipping'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='wantsLayer'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='widthAdjustLimit'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='willRemoveSubview:'>
-      <arg name='subview' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='window'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='writeEPSInsideRect:toPasteboard:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='writePDFInsideRect:toPasteboard:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSViewAnimation'>
-    <method selector='initWithViewAnimations:'>
-      <arg name='viewAnimations' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setViewAnimations:'>
-      <arg name='viewAnimations' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewAnimations'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSViewController'>
-    <method selector='commitEditing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='commitEditingWithDelegate:didCommitSelector:contextInfo:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <arg name='didCommitSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='discardEditing'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithNibName:bundle:'>
-      <arg name='nibNameOrNil' declared_type='NSString*' type='@' index='0'/>
-      <arg name='nibBundleOrNil' declared_type='NSBundle*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='loadView'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='nibBundle'>
-      <retval declared_type='NSBundle*' type='@'/>
-    </method>
-    <method selector='nibName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='representedObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setRepresentedObject:'>
-      <arg name='representedObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setView:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='view'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-  </class>
-  <class name='NSWindow'>
-    <method selector='acceptsMouseMovedEvents'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='addChildWindow:ordered:'>
-      <arg name='childWin' declared_type='NSWindow*' type='@' index='0'/>
-      <arg name='place' declared_type='NSWindowOrderingMode' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='allowsToolTipsWhenApplicationIsInactive'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='alphaValue'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='animationResizeTime:'>
-      <arg name='newFrame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='areCursorRectsEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='aspectRatio'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='attachedSheet'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='autorecalculatesContentBorderThicknessForEdge:'>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='autorecalculatesKeyViewLoop'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='backingLocation'>
-      <retval declared_type='NSWindowBackingLocation' type='I' type64='Q'/>
-    </method>
-    <method selector='backingType'>
-      <retval declared_type='NSBackingStoreType' type='I' type64='Q'/>
-    </method>
-    <method selector='becomeKeyWindow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='becomeMainWindow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='cacheImageInRect:'>
-      <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='canBeVisibleOnAllSpaces'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canBecomeKeyWindow'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canBecomeMainWindow'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canBecomeVisibleWithoutLogin'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canHide'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canStoreColor'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cascadeTopLeftFromPoint:'>
-      <arg name='topLeftPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='center'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='childWindows'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='close'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='collectionBehavior'>
-      <retval declared_type='NSWindowCollectionBehavior' type='I' type64='Q'/>
-    </method>
-    <method selector='constrainFrameRect:toScreen:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='screen' declared_type='NSScreen*' type='@' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='contentAspectRatio'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='contentBorderThicknessForEdge:'>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='0'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='contentMaxSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='contentMinSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='contentRectForFrameRect:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method class_method='true' selector='contentRectForFrameRect:styleMask:'>
-      <arg name='fRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='aStyle' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='contentResizeIncrements'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='contentView'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='convertBaseToScreen:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='convertScreenToBase:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='currentEvent'>
-      <retval declared_type='NSEvent*' type='@'/>
-    </method>
-    <method selector='dataWithEPSInsideRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='dataWithPDFInsideRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='deepestScreen'>
-      <retval declared_type='NSScreen*' type='@'/>
-    </method>
-    <method selector='defaultButtonCell'>
-      <retval declared_type='NSButtonCell*' type='@'/>
-    </method>
-    <method class_method='true' selector='defaultDepthLimit'>
-      <retval declared_type='NSWindowDepth' type='i'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='deminiaturize:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='depthLimit'>
-      <retval declared_type='NSWindowDepth' type='i'/>
-    </method>
-    <method selector='deviceDescription'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='disableCursorRects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='disableFlushWindow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='disableKeyEquivalentForDefaultButtonCell'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='disableScreenUpdatesUntilFlush'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='discardCachedImage'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='discardCursorRects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='discardEventsMatchingMask:beforeEvent:'>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='lastEvent' declared_type='NSEvent*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='display'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='displayIfNeeded'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='displaysWhenScreenProfileChanges'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='dockTile'>
-      <retval declared_type='NSDockTile*' type='@'/>
-    </method>
-    <method selector='dragImage:at:offset:event:pasteboard:source:slideBack:'>
-      <arg name='anImage' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='baseLocation' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='initialOffset' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='2'/>
-      <arg name='event' declared_type='NSEvent*' type='@' index='3'/>
-      <arg name='pboard' declared_type='NSPasteboard*' type='@' index='4'/>
-      <arg name='sourceObj' declared_type='id' type='@' index='5'/>
-      <arg name='slideFlag' declared_type='BOOL' type='B' index='6'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='drawers'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='enableCursorRects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='enableFlushWindow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='enableKeyEquivalentForDefaultButtonCell'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='endEditingFor:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='fieldEditor:forObject:'>
-      <arg name='createFlag' declared_type='BOOL' type='B' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSText*' type='@'/>
-    </method>
-    <method selector='firstResponder'>
-      <retval declared_type='NSResponder*' type='@'/>
-    </method>
-    <method selector='flushWindow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='flushWindowIfNeeded'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='frame'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='frameAutosaveName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='frameRectForContentRect:'>
-      <arg name='contentRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method class_method='true' selector='frameRectForContentRect:styleMask:'>
-      <arg name='cRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='aStyle' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='gState'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='graphicsContext'>
-      <retval declared_type='NSGraphicsContext*' type='@'/>
-    </method>
-    <method selector='handleCloseScriptCommand:'>
-      <arg name='command' declared_type='NSCloseCommand*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='handlePrintScriptCommand:'>
-      <arg name='command' declared_type='NSScriptCommand*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='handleSaveScriptCommand:'>
-      <arg name='command' declared_type='NSScriptCommand*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='hasCloseBox'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasDynamicDepthLimit'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasShadow'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasTitleBar'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hidesOnDeactivate'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='ignoresMouseEvents'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initWithContentRect:styleMask:backing:defer:'>
-      <arg name='contentRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='aStyle' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='bufferingType' declared_type='NSBackingStoreType' type='I' type64='Q' index='2'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentRect:styleMask:backing:defer:screen:'>
-      <arg name='contentRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='aStyle' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='bufferingType' declared_type='NSBackingStoreType' type='I' type64='Q' index='2'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='3'/>
-      <arg name='screen' declared_type='NSScreen*' type='@' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithWindowRef:'>
-      <arg name='windowRef' declared_type='void*' type='^v' index='0'/>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='initialFirstResponder'>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='invalidateCursorRectsForView:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='invalidateShadow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isAutodisplay'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isDocumentEdited'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isExcludedFromWindowsMenu'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isFloatingPanel'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isFlushWindowDisabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isKeyWindow'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isMainWindow'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isMiniaturizable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isMiniaturized'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isModalPanel'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isMovableByWindowBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isOneShot'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isOpaque'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isReleasedWhenClosed'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isResizable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSheet'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isVisible'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isZoomable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isZoomed'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keyDown:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='keyViewSelectionDirection'>
-      <retval declared_type='NSSelectionDirection' type='I' type64='Q'/>
-    </method>
-    <method selector='level'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='makeFirstResponder:'>
-      <arg name='aResponder' declared_type='NSResponder*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='makeKeyAndOrderFront:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='makeKeyWindow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='makeMainWindow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='maxSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method class_method='true' selector='menuChanged:'>
-      <arg name='menu' declared_type='NSMenu*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='minFrameWidthWithTitle:styleMask:'>
-      <arg name='aTitle' declared_type='NSString*' type='@' index='0'/>
-      <arg name='aStyle' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='minSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='miniaturize:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='miniwindowImage'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='miniwindowTitle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='mouseLocationOutsideOfEventStream'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='nextEventMatchingMask:'>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSEvent*' type='@'/>
-    </method>
-    <method selector='nextEventMatchingMask:untilDate:inMode:dequeue:'>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='expiration' declared_type='NSDate*' type='@' index='1'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='2'/>
-      <arg name='deqFlag' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='NSEvent*' type='@'/>
-    </method>
-    <method selector='orderBack:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderFront:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderFrontRegardless'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderOut:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderWindow:relativeTo:'>
-      <arg name='place' declared_type='NSWindowOrderingMode' type='i' type64='q' index='0'/>
-      <arg name='otherWin' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orderedIndex'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='parentWindow'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='performClose:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performMiniaturize:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performZoom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='postEvent:atStart:'>
-      <arg name='event' declared_type='NSEvent*' type='@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='preferredBackingLocation'>
-      <retval declared_type='NSWindowBackingLocation' type='I' type64='Q'/>
-    </method>
-    <method selector='preservesContentDuringLiveResize'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='print:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='recalculateKeyViewLoop'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='registerForDraggedTypes:'>
-      <arg name='newTypes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeChildWindow:'>
-      <arg name='childWin' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='removeFrameUsingName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='representedFilename'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='representedURL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='resetCursorRects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resignKeyWindow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resignMainWindow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resizeFlags'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='resizeIncrements'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='restoreCachedImage'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='runToolbarCustomizationPalette:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='saveFrameUsingName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='screen'>
-      <retval declared_type='NSScreen*' type='@'/>
-    </method>
-    <method selector='selectKeyViewFollowingView:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectKeyViewPrecedingView:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectNextKeyView:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectPreviousKeyView:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sendEvent:'>
-      <arg name='theEvent' declared_type='NSEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAcceptsMouseMovedEvents:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsToolTipsWhenApplicationIsInactive:'>
-      <arg name='allowWhenInactive' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlphaValue:'>
-      <arg name='windowAlpha' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAspectRatio:'>
-      <arg name='ratio' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutodisplay:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutorecalculatesContentBorderThickness:forEdge:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutorecalculatesKeyViewLoop:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='color' declared_type='NSColor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackingType:'>
-      <arg name='bufferingType' declared_type='NSBackingStoreType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCanBeVisibleOnAllSpaces:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCanBecomeVisibleWithoutLogin:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCanHide:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCollectionBehavior:'>
-      <arg name='behavior' declared_type='NSWindowCollectionBehavior' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentAspectRatio:'>
-      <arg name='ratio' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentBorderThickness:forEdge:'>
-      <arg name='thickness' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentMaxSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentMinSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentResizeIncrements:'>
-      <arg name='increments' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentSize:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContentView:'>
-      <arg name='aView' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDefaultButtonCell:'>
-      <arg name='defButt' declared_type='NSButtonCell*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDepthLimit:'>
-      <arg name='limit' declared_type='NSWindowDepth' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDisplaysWhenScreenProfileChanges:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDocumentEdited:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDynamicDepthLimit:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setExcludedFromWindowsMenu:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrame:display:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrame:display:animate:'>
-      <arg name='frameRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='displayFlag' declared_type='BOOL' type='B' index='1'/>
-      <arg name='animateFlag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrameAutosaveName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setFrameFromString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrameOrigin:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrameTopLeftPoint:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrameUsingName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setFrameUsingName:force:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='force' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setHasShadow:'>
-      <arg name='hasShadow' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHidesOnDeactivate:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIgnoresMouseEvents:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setInitialFirstResponder:'>
-      <arg name='view' declared_type='NSView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIsMiniaturized:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIsVisible:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIsZoomed:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLevel:'>
-      <arg name='newLevel' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMiniwindowImage:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMiniwindowTitle:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMovableByWindowBackground:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOneShot:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOpaque:'>
-      <arg name='isOpaque' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOrderedIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setParentWindow:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPreferredBackingLocation:'>
-      <arg name='backingLocation' declared_type='NSWindowBackingLocation' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPreservesContentDuringLiveResize:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setReleasedWhenClosed:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRepresentedFilename:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRepresentedURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setResizeIncrements:'>
-      <arg name='increments' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSharingType:'>
-      <arg name='type' declared_type='NSWindowSharingType' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsResizeIndicator:'>
-      <arg name='show' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShowsToolbarButton:'>
-      <arg name='show' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitle:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTitleWithRepresentedFilename:'>
-      <arg name='filename' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setToolbar:'>
-      <arg name='toolbar' declared_type='NSToolbar*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setViewsNeedDisplay:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWindowController:'>
-      <arg name='windowController' declared_type='NSWindowController*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sharingType'>
-      <retval declared_type='NSWindowSharingType' type='I' type64='Q'/>
-    </method>
-    <method selector='showsResizeIndicator'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='showsToolbarButton'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='standardWindowButton:'>
-      <arg name='b' declared_type='NSWindowButton' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSButton*' type='@'/>
-    </method>
-    <method class_method='true' selector='standardWindowButton:forStyleMask:'>
-      <arg name='b' declared_type='NSWindowButton' type='I' type64='Q' index='0'/>
-      <arg name='styleMask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSButton*' type='@'/>
-    </method>
-    <method selector='stringWithSavedFrame'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='styleMask'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='toggleToolbarShown:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toolbar'>
-      <retval declared_type='NSToolbar*' type='@'/>
-    </method>
-    <method selector='tryToPerform:with:'>
-      <arg name='anAction' declared_type='SEL' type=':' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='unregisterDraggedTypes'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='update'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='useOptimizedDrawing:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='userSpaceScaleFactor'>
-      <retval declared_type='CGFloat' type='f' type64='d'/>
-    </method>
-    <method selector='validRequestorForSendType:returnType:'>
-      <arg name='sendType' declared_type='NSString*' type='@' index='0'/>
-      <arg name='returnType' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='viewsNeedDisplay'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='windowController'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='windowNumber'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='windowRef'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='worksWhenModal'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='zoom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSWindowController'>
-    <method selector='close'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='document'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithWindow:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithWindowNibName:'>
-      <arg name='windowNibName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithWindowNibName:owner:'>
-      <arg name='windowNibName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='owner' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithWindowNibPath:owner:'>
-      <arg name='windowNibPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='owner' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isWindowLoaded'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='loadWindow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='owner'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setDocument:'>
-      <arg name='document' declared_type='NSDocument*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDocumentEdited:'>
-      <arg name='dirtyFlag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShouldCascadeWindows:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShouldCloseDocument:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWindow:'>
-      <arg name='window' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWindowFrameAutosaveName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shouldCascadeWindows'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='shouldCloseDocument'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='showWindow:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='synchronizeWindowTitleWithDocumentName'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='window'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='windowDidLoad'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='windowFrameAutosaveName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='windowNibName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='windowNibPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='windowTitleForDocumentDisplayName:'>
-      <arg name='displayName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='windowWillLoad'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSWorkspace'>
-    <method selector='absolutePathForAppBundleWithIdentifier:'>
-      <arg name='bundleIdentifier' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='activeApplication'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='checkForRemovableMedia'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='extendPowerOffBy:'>
-      <arg name='requested' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='fileSystemChanged'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='filenameExtension:isValidForType:'>
-      <arg name='filenameExtension' declared_type='NSString*' type='@' index='0'/>
-      <arg name='typeName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='findApplications'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='fullPathForApplication:'>
-      <arg name='appName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='getFileSystemInfoForPath:isRemovable:isWritable:isUnmountable:description:type:'>
-      <arg name='fullPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='removableFlag' declared_type='BOOL*' type='^B' index='1' type_modifier='o'/>
-      <arg name='writableFlag' declared_type='BOOL*' type='^B' index='2' type_modifier='o'/>
-      <arg name='unmountableFlag' declared_type='BOOL*' type='^B' index='3' type_modifier='o'/>
-      <arg name='description' declared_type='NSString**' type='^@' index='4'/>
-      <arg name='fileSystemType' declared_type='NSString**' type='^@' index='5'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='getInfoForFile:application:type:'>
-      <arg name='fullPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='appName' declared_type='NSString**' type='^@' index='1'/>
-      <arg name='type' declared_type='NSString**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hideOtherApplications'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='iconForFile:'>
-      <arg name='fullPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='iconForFileType:'>
-      <arg name='fileType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='iconForFiles:'>
-      <arg name='fullPaths' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='isFilePackageAtPath:'>
-      <arg name='fullPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='launchAppWithBundleIdentifier:options:additionalEventParamDescriptor:launchIdentifier:'>
-      <arg name='bundleIdentifier' declared_type='NSString*' type='@' index='0'/>
-      <arg name='options' declared_type='NSWorkspaceLaunchOptions' type='I' type64='Q' index='1'/>
-      <arg name='descriptor' declared_type='NSAppleEventDescriptor*' type='@' index='2'/>
-      <arg name='identifier' declared_type='NSNumber**' type='^@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='launchApplication:'>
-      <arg name='appName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='launchApplication:showIcon:autolaunch:'>
-      <arg name='appName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='showIcon' declared_type='BOOL' type='B' index='1'/>
-      <arg name='autolaunch' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='launchedApplications'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='localizedDescriptionForType:'>
-      <arg name='typeName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='mountNewRemovableMedia'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='mountedLocalVolumePaths'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='mountedRemovableMedia'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='noteFileSystemChanged'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='noteFileSystemChanged:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='noteUserDefaultsChanged'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='notificationCenter'>
-      <retval declared_type='NSNotificationCenter*' type='@'/>
-    </method>
-    <method selector='openFile:'>
-      <arg name='fullPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='openFile:fromImage:at:inView:'>
-      <arg name='fullPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='anImage' declared_type='NSImage*' type='@' index='1'/>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='2'/>
-      <arg name='aView' declared_type='NSView*' type='@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='openFile:withApplication:'>
-      <arg name='fullPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='appName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='openFile:withApplication:andDeactivate:'>
-      <arg name='fullPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='appName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='openTempFile:'>
-      <arg name='fullPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='openURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='openURLs:withAppBundleIdentifier:options:additionalEventParamDescriptor:launchIdentifiers:'>
-      <arg name='urls' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='bundleIdentifier' declared_type='NSString*' type='@' index='1'/>
-      <arg name='options' declared_type='NSWorkspaceLaunchOptions' type='I' type64='Q' index='2'/>
-      <arg name='descriptor' declared_type='NSAppleEventDescriptor*' type='@' index='3'/>
-      <arg name='identifiers' declared_type='NSArray**' type='^@' index='4'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='performFileOperation:source:destination:files:tag:'>
-      <arg name='operation' declared_type='NSString*' type='@' index='0'/>
-      <arg name='source' declared_type='NSString*' type='@' index='1'/>
-      <arg name='destination' declared_type='NSString*' type='@' index='2'/>
-      <arg name='files' declared_type='NSArray*' type='@' index='3'/>
-      <arg name='tag' declared_type='NSInteger*' type='^i' type64='^q' index='4'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='preferredFilenameExtensionForType:'>
-      <arg name='typeName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='selectFile:inFileViewerRootedAtPath:'>
-      <arg name='fullPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='rootFullpath' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setIcon:forFile:options:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='fullPath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='options' declared_type='NSWorkspaceIconCreationOptions' type='I' type64='Q' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='sharedWorkspace'>
-      <retval declared_type='NSWorkspace*' type='@'/>
-    </method>
-    <method selector='slideImage:from:to:'>
-      <arg name='image' declared_type='NSImage*' type='@' index='0'/>
-      <arg name='fromPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <arg name='toPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='type:conformsToType:'>
-      <arg name='firstTypeName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='secondTypeName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='typeOfFile:error:'>
-      <arg name='absoluteFilePath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='unmountAndEjectDeviceAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='userDefaultsChanged'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <informal_protocol name='NSAccessibility'>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='accessibilityActionDescription:'>
-      <arg name='action' index='0'/>
-    </method>
-    <method type='@8@0:4' type64='@16@0:8' selector='accessibilityActionNames'/>
-    <method type='@8@0:4' type64='@16@0:8' selector='accessibilityAttributeNames'/>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='accessibilityAttributeValue:'>
-      <arg name='attribute' index='0'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='accessibilityAttributeValue:forParameter:'>
-      <arg name='attribute' index='0'/>
-      <arg name='parameter' index='1'/>
-    </method>
-    <method type='@8@0:4' type64='@16@0:8' selector='accessibilityFocusedUIElement'/>
-    <method type='@16@0:4{_NSPoint=ff}8' type64='@32@0:8{CGPoint=dd}16' selector='accessibilityHitTest:'>
-      <arg name='point' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='accessibilityIsAttributeSettable:'>
-      <arg name='attribute' index='0'/>
-    </method>
-    <method type='B8@0:4' type64='B16@0:8' selector='accessibilityIsIgnored'/>
-    <method type='@8@0:4' type64='@16@0:8' selector='accessibilityParameterizedAttributeNames'/>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='accessibilityPerformAction:'>
-      <arg name='action' index='0'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='accessibilitySetValue:forAttribute:'>
-      <arg name='value' index='0'/>
-      <arg name='attribute' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSAccessibilityAdditions'>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='accessibilitySetOverrideValue:forAttribute:'>
-      <arg name='value' index='0'/>
-      <arg name='attribute' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSAlertDelegate'>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='alertShowHelp:'>
-      <arg name='alert' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSAnimationDelegate'>
-    <method type='v16@0:4@8f12' type64='v28@0:8@16f24' selector='animation:didReachProgressMark:'>
-      <arg name='animation' index='0'/>
-      <arg name='progress' index='1'/>
-    </method>
-    <method type='f16@0:4@8f12' type64='f28@0:8@16f24' selector='animation:valueForProgress:'>
-      <arg name='animation' index='0'/>
-      <arg name='progress' index='1'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='animationDidEnd:'>
-      <arg name='animation' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='animationDidStop:'>
-      <arg name='animation' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='animationShouldStart:'>
-      <arg name='animation' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSApplicationDelegate'>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='application:openFile:'>
-      <arg name='sender' index='0'/>
-      <arg name='filename' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='application:openFileWithoutUI:'>
-      <arg name='sender' index='0'/>
-      <arg name='filename' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='application:openFiles:'>
-      <arg name='sender' index='0'/>
-      <arg name='filenames' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='application:openTempFile:'>
-      <arg name='sender' index='0'/>
-      <arg name='filename' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='application:printFile:'>
-      <arg name='sender' index='0'/>
-      <arg name='filename' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='application:printFiles:'>
-      <arg name='sender' index='0'/>
-      <arg name='filenames' index='1'/>
-    </method>
-    <method type='I24@0:4@8@12@16B20' type64='Q44@0:8@16@24@32B40' selector='application:printFiles:withSettings:showPrintPanels:'>
-      <arg name='application' index='0'/>
-      <arg name='fileNames' index='1'/>
-      <arg name='printSettings' index='2'/>
-      <arg name='showPrintPanels' index='3'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='application:willPresentError:'>
-      <arg name='application' index='0'/>
-      <arg name='error' index='1'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='applicationDockMenu:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='applicationOpenUntitledFile:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='B16@0:4@8B12' type64='B28@0:8@16B24' selector='applicationShouldHandleReopen:hasVisibleWindows:'>
-      <arg name='sender' index='0'/>
-      <arg name='flag' index='1'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='applicationShouldOpenUntitledFile:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='I12@0:4@8' type64='Q24@0:8@16' selector='applicationShouldTerminate:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='applicationShouldTerminateAfterLastWindowClosed:'>
-      <arg name='sender' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSApplicationNotifications'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationDidBecomeActive:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationDidChangeScreenParameters:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationDidFinishLaunching:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationDidHide:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationDidResignActive:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationDidUnhide:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationDidUpdate:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationWillBecomeActive:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationWillFinishLaunching:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationWillHide:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationWillResignActive:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationWillTerminate:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationWillUnhide:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='applicationWillUpdate:'>
-      <arg name='notification' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSApplicationScriptingDelegation'>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='application:delegateHandlesKey:'>
-      <arg name='sender' index='0'/>
-      <arg name='key' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSBrowserDelegate'>
-    <method type='B28@0:4@8@12i16i20I24' type64='B56@0:8@16@24q32q40Q48' selector='browser:acceptDrop:atRow:column:dropOperation:'>
-      <arg name='browser' index='0'/>
-      <arg name='info' index='1'/>
-      <arg name='row' index='2'/>
-      <arg name='column' index='3'/>
-      <arg name='dropOperation' index='4'/>
-    </method>
-    <method type='B24@0:4@8@12i16@20' type64='B48@0:8@16@24q32@40' selector='browser:canDragRowsWithIndexes:inColumn:withEvent:'>
-      <arg name='browser' index='0'/>
-      <arg name='rowIndexes' index='1'/>
-      <arg name='column' index='2'/>
-      <arg name='event' index='3'/>
-    </method>
-    <method type='v20@0:4@8i12@16' type64='v40@0:8@16q24@32' selector='browser:createRowsForColumn:inMatrix:'>
-      <arg name='sender' index='0'/>
-      <arg name='column' index='1'/>
-      <arg name='matrix' index='2'/>
-    </method>
-    <method type='@28@0:4@8@12i16@20^{_NSPoint=ff}24' type64='@56@0:8@16@24q32@40^{CGPoint=dd}48' selector='browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:'>
-      <arg name='browser' index='0'/>
-      <arg name='rowIndexes' index='1'/>
-      <arg name='column' index='2'/>
-      <arg name='event' index='3'/>
-      <arg name='dragImageOffset' index='4'/>
-    </method>
-    <method type='B16@0:4@8i12' type64='B32@0:8@16q24' selector='browser:isColumnValid:'>
-      <arg name='sender' index='0'/>
-      <arg name='column' index='1'/>
-    </method>
-    <method type='@24@0:4@8@12@16i20' type64='@48@0:8@16@24@32q40' selector='browser:namesOfPromisedFilesDroppedAtDestination:forDraggedRowsWithIndexes:inColumn:'>
-      <arg name='browser' index='0'/>
-      <arg name='dropDestination' index='1'/>
-      <arg name='rowIndexes' index='2'/>
-      <arg name='column' index='3'/>
-    </method>
-    <method type='i28@0:4@8i12i16i20@24' type64='q56@0:8@16q24q32q40@48' selector='browser:nextTypeSelectMatchFromRow:toRow:inColumn:forString:'>
-      <arg name='browser' index='0'/>
-      <arg name='startRow' index='1'/>
-      <arg name='endRow' index='2'/>
-      <arg name='column' index='3'/>
-      <arg name='searchString' index='4'/>
-    </method>
-    <method type='i16@0:4@8i12' type64='q32@0:8@16q24' selector='browser:numberOfRowsInColumn:'>
-      <arg name='sender' index='0'/>
-      <arg name='column' index='1'/>
-    </method>
-    <method type='B20@0:4@8@12i16' type64='B40@0:8@16@24q32' selector='browser:selectCellWithString:inColumn:'>
-      <arg name='sender' index='0'/>
-      <arg name='title' index='1'/>
-      <arg name='column' index='2'/>
-    </method>
-    <method type='B20@0:4@8i12i16' type64='B40@0:8@16q24q32' selector='browser:selectRow:inColumn:'>
-      <arg name='sender' index='0'/>
-      <arg name='row' index='1'/>
-      <arg name='column' index='2'/>
-    </method>
-    <method type='B20@0:4@8i12i16' type64='B40@0:8@16q24q32' selector='browser:shouldShowCellExpansionForRow:column:'>
-      <arg name='browser' index='0'/>
-      <arg name='row' index='1'/>
-      <arg name='column' index='2'/>
-    </method>
-    <method type='f24@0:4@8i12B16f20' type64='d44@0:8@16q24B32d36' selector='browser:shouldSizeColumn:forUserResize:toWidth:'>
-      <arg name='browser' index='0'/>
-      <arg name='columnIndex' index='1'/>
-      <arg name='forUserResize' index='2'/>
-      <arg name='suggestedWidth' index='3'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='browser:shouldTypeSelectForEvent:withCurrentSearchString:'>
-      <arg name='browser' index='0'/>
-      <arg name='event' index='1'/>
-      <arg name='searchString' index='2'/>
-    </method>
-    <method type='f16@0:4@8i12' type64='d32@0:8@16q24' selector='browser:sizeToFitWidthOfColumn:'>
-      <arg name='browser' index='0'/>
-      <arg name='columnIndex' index='1'/>
-    </method>
-    <method type='@16@0:4@8i12' type64='@32@0:8@16q24' selector='browser:titleOfColumn:'>
-      <arg name='sender' index='0'/>
-      <arg name='column' index='1'/>
-    </method>
-    <method type='@20@0:4@8i12i16' type64='@40@0:8@16q24q32' selector='browser:typeSelectStringForRow:inColumn:'>
-      <arg name='browser' index='0'/>
-      <arg name='row' index='1'/>
-      <arg name='column' index='2'/>
-    </method>
-    <method type='I28@0:4@8@12^i16^i20^I24' type64='Q56@0:8@16@24^q32^q40^Q48' selector='browser:validateDrop:proposedRow:column:dropOperation:'>
-      <arg name='browser' index='0'/>
-      <arg name='info' index='1'/>
-      <arg name='row' index='2'/>
-      <arg name='column' index='3'/>
-      <arg name='dropOperation' index='4'/>
-    </method>
-    <method type='v24@0:4@8@12i16i20' type64='v48@0:8@16@24q32q40' selector='browser:willDisplayCell:atRow:column:'>
-      <arg name='sender' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='row' index='2'/>
-      <arg name='column' index='3'/>
-    </method>
-    <method type='B24@0:4@8@12i16@20' type64='B48@0:8@16@24q32@40' selector='browser:writeRowsWithIndexes:inColumn:toPasteboard:'>
-      <arg name='browser' index='0'/>
-      <arg name='rowIndexes' index='1'/>
-      <arg name='column' index='2'/>
-      <arg name='pasteboard' index='3'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='browserColumnConfigurationDidChange:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='browserDidScroll:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='browserWillScroll:'>
-      <arg name='sender' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSColorPanelResponderMethod'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='changeColor:'>
-      <arg name='sender' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSComboBoxCellDataSource'>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='comboBoxCell:completedString:'>
-      <arg name='aComboBoxCell' index='0'/>
-      <arg name='uncompletedString' index='1'/>
-    </method>
-    <method type='I16@0:4@8@12' type64='Q32@0:8@16@24' selector='comboBoxCell:indexOfItemWithStringValue:'>
-      <arg name='aComboBoxCell' index='0'/>
-      <arg name='string' index='1'/>
-    </method>
-    <method type='@16@0:4@8i12' type64='@32@0:8@16q24' selector='comboBoxCell:objectValueForItemAtIndex:'>
-      <arg name='aComboBoxCell' index='0'/>
-      <arg name='index' index='1'/>
-    </method>
-    <method type='i12@0:4@8' type64='q24@0:8@16' selector='numberOfItemsInComboBoxCell:'>
-      <arg name='comboBoxCell' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSComboBoxDataSource'>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='comboBox:completedString:'>
-      <arg name='aComboBox' index='0'/>
-      <arg name='string' index='1'/>
-    </method>
-    <method type='I16@0:4@8@12' type64='Q32@0:8@16@24' selector='comboBox:indexOfItemWithStringValue:'>
-      <arg name='aComboBox' index='0'/>
-      <arg name='string' index='1'/>
-    </method>
-    <method type='@16@0:4@8i12' type64='@32@0:8@16q24' selector='comboBox:objectValueForItemAtIndex:'>
-      <arg name='aComboBox' index='0'/>
-      <arg name='index' index='1'/>
-    </method>
-    <method type='i12@0:4@8' type64='q24@0:8@16' selector='numberOfItemsInComboBox:'>
-      <arg name='aComboBox' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSComboBoxNotifications'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='comboBoxSelectionDidChange:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='comboBoxSelectionIsChanging:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='comboBoxWillDismiss:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='comboBoxWillPopUp:'>
-      <arg name='notification' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSControlSubclassDelegate'>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='control:didFailToFormatString:errorDescription:'>
-      <arg name='control' index='0'/>
-      <arg name='string' index='1'/>
-      <arg name='error' index='2'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='control:didFailToValidatePartialString:errorDescription:'>
-      <arg name='control' index='0'/>
-      <arg name='string' index='1'/>
-      <arg name='error' index='2'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='control:isValidObject:'>
-      <arg name='control' index='0'/>
-      <arg name='obj' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='control:textShouldBeginEditing:'>
-      <arg name='control' index='0'/>
-      <arg name='fieldEditor' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='control:textShouldEndEditing:'>
-      <arg name='control' index='0'/>
-      <arg name='fieldEditor' index='1'/>
-    </method>
-    <method type='@32@0:4@8@12@16{_NSRange=II}20^i28' type64='@64@0:8@16@24@32{_NSRange=QQ}40^q56' selector='control:textView:completions:forPartialWordRange:indexOfSelectedItem:'>
-      <arg name='control' index='0'/>
-      <arg name='textView' index='1'/>
-      <arg name='words' index='2'/>
-      <arg name='charRange' index='3'/>
-      <arg name='index' index='4'/>
-    </method>
-    <method type='B20@0:4@8@12:16' type64='B40@0:8@16@24:32' selector='control:textView:doCommandBySelector:'>
-      <arg name='control' index='0'/>
-      <arg name='textView' index='1'/>
-      <arg name='commandSelector' index='2'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSControlSubclassNotifications'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='controlTextDidBeginEditing:'>
-      <arg name='obj' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='controlTextDidChange:'>
-      <arg name='obj' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='controlTextDidEndEditing:'>
-      <arg name='obj' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSDatePickerCellDelegate'>
-    <method type='v20@0:4@8^@12^d16' type64='v40@0:8@16^@24^d32' selector='datePickerCell:validateProposedDateValue:timeInterval:'>
-      <arg name='aDatePickerCell' index='0'/>
-      <arg name='proposedDateValue' index='1'/>
-      <arg name='proposedTimeInterval' index='2'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSDictionaryControllerKeyValuePair'>
-    <method type='B8@0:4' type64='B16@0:8' selector='isExplicitlyIncluded'/>
-    <method type='@8@0:4' type64='@16@0:8' selector='key'/>
-    <method type='@8@0:4' type64='@16@0:8' selector='localizedKey'/>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='setKey:'>
-      <arg name='key' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='setLocalizedKey:'>
-      <arg name='localizedKey' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='setValue:'>
-      <arg name='value' index='0'/>
-    </method>
-    <method type='@8@0:4' type64='@16@0:8' selector='value'/>
-  </informal_protocol>
-  <informal_protocol name='NSDraggingDestination'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='concludeDragOperation:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='draggingEnded:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='I12@0:4@8' type64='Q24@0:8@16' selector='draggingEntered:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='draggingExited:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='I12@0:4@8' type64='Q24@0:8@16' selector='draggingUpdated:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='performDragOperation:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='prepareForDragOperation:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='B8@0:4' type64='B16@0:8' selector='wantsPeriodicDraggingUpdates'/>
-  </informal_protocol>
-  <informal_protocol name='NSDraggingSource'>
-    <method type='v20@0:4@8{_NSPoint=ff}12' type64='v40@0:8@16{CGPoint=dd}24' selector='draggedImage:beganAt:'>
-      <arg name='image' index='0'/>
-      <arg name='screenPoint' index='1'/>
-    </method>
-    <method type='v24@0:4@8{_NSPoint=ff}12B20' type64='v44@0:8@16{CGPoint=dd}24B40' selector='draggedImage:endedAt:deposited:'>
-      <arg name='image' index='0'/>
-      <arg name='screenPoint' index='1'/>
-      <arg name='flag' index='2'/>
-    </method>
-    <method type='v24@0:4@8{_NSPoint=ff}12I20' type64='v48@0:8@16{CGPoint=dd}24Q40' selector='draggedImage:endedAt:operation:'>
-      <arg name='image' index='0'/>
-      <arg name='screenPoint' index='1'/>
-      <arg name='operation' index='2'/>
-    </method>
-    <method type='v20@0:4@8{_NSPoint=ff}12' type64='v40@0:8@16{CGPoint=dd}24' selector='draggedImage:movedTo:'>
-      <arg name='image' index='0'/>
-      <arg name='screenPoint' index='1'/>
-    </method>
-    <method type='I12@0:4B8' type64='Q20@0:8B16' selector='draggingSourceOperationMaskForLocal:'>
-      <arg name='flag' index='0'/>
-    </method>
-    <method type='B8@0:4' type64='B16@0:8' selector='ignoreModifierKeysWhileDragging'/>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='namesOfPromisedFilesDroppedAtDestination:'>
-      <arg name='dropDestination' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSDrawerDelegate'>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='drawerShouldClose:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='drawerShouldOpen:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='{_NSSize=ff}20@0:4@8{_NSSize=ff}12' type64='{CGSize=dd}40@0:8@16{CGSize=dd}24' selector='drawerWillResizeContents:toSize:'>
-      <arg name='sender' index='0'/>
-      <arg name='contentSize' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSDrawerNotifications'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='drawerDidClose:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='drawerDidOpen:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='drawerWillClose:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='drawerWillOpen:'>
-      <arg name='notification' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSEditor'>
-    <method type='B8@0:4' type64='B16@0:8' selector='commitEditing'/>
-    <method type='v20@0:4@8:12^v16' type64='v40@0:8@16:24^v32' selector='commitEditingWithDelegate:didCommitSelector:contextInfo:'>
-      <arg name='delegate' index='0'/>
-      <arg name='didCommitSelector' index='1'/>
-      <arg name='contextInfo' index='2'/>
-    </method>
-    <method type='v8@0:4' type64='v16@0:8' selector='discardEditing'/>
-  </informal_protocol>
-  <informal_protocol name='NSEditorRegistration'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='objectDidBeginEditing:'>
-      <arg name='editor' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='objectDidEndEditing:'>
-      <arg name='editor' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSFontManagerDelegate'>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='fontManager:willIncludeFont:'>
-      <arg name='sender' index='0'/>
-      <arg name='fontName' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSFontManagerResponderMethod'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='changeFont:'>
-      <arg name='sender' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSFontPanelValidationAdditions'>
-    <method type='I12@0:4@8' type64='Q24@0:8@16' selector='validModesForFontPanel:'>
-      <arg name='fontPanel' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSImageDelegate'>
-    <method type='v20@0:4@8@12i16' type64='v40@0:8@16@24q32' selector='image:didLoadPartOfRepresentation:withValidRows:'>
-      <arg name='image' index='0'/>
-      <arg name='rep' index='1'/>
-      <arg name='rows' index='2'/>
-    </method>
-    <method type='v20@0:4@8@12I16' type64='v40@0:8@16@24Q32' selector='image:didLoadRepresentation:withStatus:'>
-      <arg name='image' index='0'/>
-      <arg name='rep' index='1'/>
-      <arg name='status' index='2'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='image:didLoadRepresentationHeader:'>
-      <arg name='image' index='0'/>
-      <arg name='rep' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='image:willLoadRepresentation:'>
-      <arg name='image' index='0'/>
-      <arg name='rep' index='1'/>
-    </method>
-    <method type='@28@0:4@8{_NSRect={_NSPoint=ff}{_NSSize=ff}}12' type64='@56@0:8@16{CGRect={CGPoint=dd}{CGSize=dd}}24' selector='imageDidNotDraw:inRect:'>
-      <arg name='sender' index='0'/>
-      <arg name='aRect' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSKeyValueBindingCreation'>
-    <method type='v24@0:4@8@12@16@20' type64='v48@0:8@16@24@32@40' selector='bind:toObject:withKeyPath:options:'>
-      <arg name='binding' index='0'/>
-      <arg name='observable' index='1'/>
-      <arg name='keyPath' index='2'/>
-      <arg name='options' index='3'/>
-    </method>
-    <method class_method='true' type='v12@0:4@8' type64='v24@0:8@16' selector='exposeBinding:'>
-      <arg name='binding' index='0'/>
-    </method>
-    <method type='@8@0:4' type64='@16@0:8' selector='exposedBindings'/>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='infoForBinding:'>
-      <arg name='binding' index='0'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='optionDescriptionsForBinding:'>
-      <arg name='aBinding' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='unbind:'>
-      <arg name='binding' index='0'/>
-    </method>
-    <method type='#12@0:4@8' type64='#24@0:8@16' selector='valueClassForBinding:'>
-      <arg name='binding' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSLayoutManagerDelegate'>
-    <method type='v20@0:4@8@12B16' type64='v36@0:8@16@24B32' selector='layoutManager:didCompleteLayoutForTextContainer:atEnd:'>
-      <arg name='layoutManager' index='0'/>
-      <arg name='textContainer' index='1'/>
-      <arg name='layoutFinishedFlag' index='2'/>
-    </method>
-    <method type='@28@0:4@8@12B16I20^{_NSRange=II}24' type64='@52@0:8@16@24B32Q36^{_NSRange=QQ}44' selector='layoutManager:shouldUseTemporaryAttributes:forDrawingToScreen:atCharacterIndex:effectiveRange:'>
-      <arg name='layoutManager' index='0'/>
-      <arg name='attrs' index='1'/>
-      <arg name='toScreen' index='2'/>
-      <arg name='charIndex' index='3'/>
-      <arg name='effectiveCharRange' index='4'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='layoutManagerDidInvalidateLayout:'>
-      <arg name='sender' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSMenuDelegate'>
-    <method type='B24@0:4@8@12i16B20' type64='B44@0:8@16@24q32B40' selector='menu:updateItem:atIndex:shouldCancel:'>
-      <arg name='menu' index='0'/>
-      <arg name='item' index='1'/>
-      <arg name='index' index='2'/>
-      <arg name='shouldCancel' index='3'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='menu:willHighlightItem:'>
-      <arg name='menu' index='0'/>
-      <arg name='item' index='1'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='menuDidClose:'>
-      <arg name='menu' index='0'/>
-    </method>
-    <method type='B24@0:4@8@12^@16^:20' type64='B48@0:8@16@24^@32^:40' selector='menuHasKeyEquivalent:forEvent:target:action:'>
-      <arg name='menu' index='0'/>
-      <arg name='event' index='1'/>
-      <arg name='target' index='2'/>
-      <arg name='action' index='3'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='menuNeedsUpdate:'>
-      <arg name='menu' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='menuWillOpen:'>
-      <arg name='menu' index='0'/>
-    </method>
-    <method type='i12@0:4@8' type64='q24@0:8@16' selector='numberOfItemsInMenu:'>
-      <arg name='menu' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSMenuValidation'>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='validateMenuItem:'>
-      <arg name='menuItem' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSNibAwaking'>
-    <method type='v8@0:4' type64='v16@0:8' selector='awakeFromNib'/>
-  </informal_protocol>
-  <informal_protocol name='NSOutlineViewDataSource'>
-    <method type='B24@0:4@8@12@16i20' type64='B48@0:8@16@24@32q40' selector='outlineView:acceptDrop:item:childIndex:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='info' index='1'/>
-      <arg name='item' index='2'/>
-      <arg name='index' index='3'/>
-    </method>
-    <method type='@20@0:4@8i12@16' type64='@40@0:8@16q24@32' selector='outlineView:child:ofItem:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='index' index='1'/>
-      <arg name='item' index='2'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='outlineView:isItemExpandable:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='item' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='outlineView:itemForPersistentObject:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='object' index='1'/>
-    </method>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='outlineView:namesOfPromisedFilesDroppedAtDestination:forDraggedItems:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='dropDestination' index='1'/>
-      <arg name='items' index='2'/>
-    </method>
-    <method type='i16@0:4@8@12' type64='q32@0:8@16@24' selector='outlineView:numberOfChildrenOfItem:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='item' index='1'/>
-    </method>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='outlineView:objectValueForTableColumn:byItem:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-      <arg name='item' index='2'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='outlineView:persistentObjectForItem:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='item' index='1'/>
-    </method>
-    <method type='v24@0:4@8@12@16@20' type64='v48@0:8@16@24@32@40' selector='outlineView:setObjectValue:forTableColumn:byItem:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='object' index='1'/>
-      <arg name='tableColumn' index='2'/>
-      <arg name='item' index='3'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='outlineView:sortDescriptorsDidChange:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='oldDescriptors' index='1'/>
-    </method>
-    <method type='I24@0:4@8@12@16i20' type64='Q48@0:8@16@24@32q40' selector='outlineView:validateDrop:proposedItem:proposedChildIndex:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='info' index='1'/>
-      <arg name='item' index='2'/>
-      <arg name='index' index='3'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='outlineView:writeItems:toPasteboard:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='items' index='1'/>
-      <arg name='pasteboard' index='2'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSOutlineViewDelegate'>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='outlineView:dataCellForTableColumn:item:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-      <arg name='item' index='2'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='outlineView:didClickTableColumn:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='outlineView:didDragTableColumn:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-    </method>
-    <method type='f16@0:4@8@12' type64='d32@0:8@16@24' selector='outlineView:heightOfRowByItem:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='item' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='outlineView:isGroupItem:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='item' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='outlineView:mouseDownInHeaderOfTableColumn:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-    </method>
-    <method type='@24@0:4@8@12@16@20' type64='@48@0:8@16@24@32@40' selector='outlineView:nextTypeSelectMatchFromItem:toItem:forString:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='startItem' index='1'/>
-      <arg name='endItem' index='2'/>
-      <arg name='searchString' index='3'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='outlineView:selectionIndexesForProposedSelection:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='proposedSelectionIndexes' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='outlineView:shouldCollapseItem:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='item' index='1'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='outlineView:shouldEditTableColumn:item:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-      <arg name='item' index='2'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='outlineView:shouldExpandItem:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='item' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='outlineView:shouldSelectItem:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='item' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='outlineView:shouldSelectTableColumn:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='outlineView:shouldShowCellExpansionForTableColumn:item:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-      <arg name='item' index='2'/>
-    </method>
-    <method type='B24@0:4@8@12@16@20' type64='B48@0:8@16@24@32@40' selector='outlineView:shouldTrackCell:forTableColumn:item:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='tableColumn' index='2'/>
-      <arg name='item' index='3'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='outlineView:shouldTypeSelectForEvent:withCurrentSearchString:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='event' index='1'/>
-      <arg name='searchString' index='2'/>
-    </method>
-    <method type='@36@0:4@8@12^{_NSRect={_NSPoint=ff}{_NSSize=ff}}16@20@24{_NSPoint=ff}28' type64='@72@0:8@16@24^{CGRect={CGPoint=dd}{CGSize=dd}}32@40@48{CGPoint=dd}56' selector='outlineView:toolTipForCell:rect:tableColumn:item:mouseLocation:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='rect' index='2'/>
-      <arg name='tableColumn' index='3'/>
-      <arg name='item' index='4'/>
-      <arg name='mouseLocation' index='5'/>
-    </method>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='outlineView:typeSelectStringForTableColumn:item:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-      <arg name='item' index='2'/>
-    </method>
-    <method type='v24@0:4@8@12@16@20' type64='v48@0:8@16@24@32@40' selector='outlineView:willDisplayCell:forTableColumn:item:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='tableColumn' index='2'/>
-      <arg name='item' index='3'/>
-    </method>
-    <method type='v24@0:4@8@12@16@20' type64='v48@0:8@16@24@32@40' selector='outlineView:willDisplayOutlineCell:forTableColumn:item:'>
-      <arg name='outlineView' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='tableColumn' index='2'/>
-      <arg name='item' index='3'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='selectionShouldChangeInOutlineView:'>
-      <arg name='outlineView' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSOutlineViewNotifications'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='outlineViewColumnDidMove:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='outlineViewColumnDidResize:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='outlineViewItemDidCollapse:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='outlineViewItemDidExpand:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='outlineViewItemWillCollapse:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='outlineViewItemWillExpand:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='outlineViewSelectionDidChange:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='outlineViewSelectionIsChanging:'>
-      <arg name='notification' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSPasteboardOwner'>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='pasteboard:provideDataForType:'>
-      <arg name='sender' index='0'/>
-      <arg name='type' index='1'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='pasteboardChangedOwner:'>
-      <arg name='sender' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSPlaceholders'>
-    <method class_method='true' type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='defaultPlaceholderForMarker:withBinding:'>
-      <arg name='marker' index='0'/>
-      <arg name='binding' index='1'/>
-    </method>
-    <method class_method='true' type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='setDefaultPlaceholder:forMarker:withBinding:'>
-      <arg name='placeholder' index='0'/>
-      <arg name='marker' index='1'/>
-      <arg name='binding' index='2'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSRuleEditorDelegateMethods'>
-    <method type='@24@0:4@8i12@16I20' type64='@48@0:8@16q24@32Q40' selector='ruleEditor:child:forCriterion:withRowType:'>
-      <arg name='editor' index='0'/>
-      <arg name='index' index='1'/>
-      <arg name='criterion' index='2'/>
-      <arg name='rowType' index='3'/>
-    </method>
-    <method type='@20@0:4@8@12i16' type64='@40@0:8@16@24q32' selector='ruleEditor:displayValueForCriterion:inRow:'>
-      <arg name='editor' index='0'/>
-      <arg name='criterion' index='1'/>
-      <arg name='row' index='2'/>
-    </method>
-    <method type='i20@0:4@8@12I16' type64='q40@0:8@16@24Q32' selector='ruleEditor:numberOfChildrenForCriterion:withRowType:'>
-      <arg name='editor' index='0'/>
-      <arg name='criterion' index='1'/>
-      <arg name='rowType' index='2'/>
-    </method>
-    <method type='@24@0:4@8@12@16i20' type64='@48@0:8@16@24@32q40' selector='ruleEditor:predicatePartsForCriterion:withDisplayValue:inRow:'>
-      <arg name='editor' index='0'/>
-      <arg name='criterion' index='1'/>
-      <arg name='value' index='2'/>
-      <arg name='row' index='3'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='ruleEditorRowsDidChange:'>
-      <arg name='notification' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSSavePanelDelegate'>
-    <method type='i24@0:4@8@12@16B20' type64='q44@0:8@16@24@32B40' selector='panel:compareFilename:with:caseSensitive:'>
-      <arg name='sender' index='0'/>
-      <arg name='name1' index='1'/>
-      <arg name='name2' index='2'/>
-      <arg name='caseSensitive' index='3'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='panel:directoryDidChange:'>
-      <arg name='sender' index='0'/>
-      <arg name='path' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='panel:isValidFilename:'>
-      <arg name='sender' index='0'/>
-      <arg name='filename' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='panel:shouldShowFilename:'>
-      <arg name='sender' index='0'/>
-      <arg name='filename' index='1'/>
-    </method>
-    <method type='@20@0:4@8@12B16' type64='@36@0:8@16@24B32' selector='panel:userEnteredFilename:confirmed:'>
-      <arg name='sender' index='0'/>
-      <arg name='filename' index='1'/>
-      <arg name='okFlag' index='2'/>
-    </method>
-    <method type='v16@0:4@8B12' type64='v28@0:8@16B24' selector='panel:willExpand:'>
-      <arg name='sender' index='0'/>
-      <arg name='expanding' index='1'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='panelSelectionDidChange:'>
-      <arg name='sender' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSServicesRequests'>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='readSelectionFromPasteboard:'>
-      <arg name='pboard' index='0'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='writeSelectionToPasteboard:types:'>
-      <arg name='pboard' index='0'/>
-      <arg name='types' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSSoundDelegateMethods'>
-    <method type='v16@0:4@8B12' type64='v28@0:8@16B24' selector='sound:didFinishPlaying:'>
-      <arg name='sound' index='0'/>
-      <arg name='aBool' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSSpeechRecognizerDelegate'>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='speechRecognizer:didRecognizeCommand:'>
-      <arg name='sender' index='0'/>
-      <arg name='command' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSSpeechSynthesizerDelegate'>
-    <method type='v24@0:4@8I12@16@20' type64='v48@0:8@16Q24@32@40' selector='speechSynthesizer:didEncounterErrorAtIndex:ofString:message:'>
-      <arg name='sender' index='0'/>
-      <arg name='characterIndex' index='1'/>
-      <arg name='string' index='2'/>
-      <arg name='message' index='3'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='speechSynthesizer:didEncounterSyncMessage:'>
-      <arg name='sender' index='0'/>
-      <arg name='message' index='1'/>
-    </method>
-    <method type='v16@0:4@8B12' type64='v28@0:8@16B24' selector='speechSynthesizer:didFinishSpeaking:'>
-      <arg name='sender' index='0'/>
-      <arg name='finishedSpeaking' index='1'/>
-    </method>
-    <method type='v16@0:4@8s12' type64='v28@0:8@16s24' selector='speechSynthesizer:willSpeakPhoneme:'>
-      <arg name='sender' index='0'/>
-      <arg name='phonemeOpcode' index='1'/>
-    </method>
-    <method type='v24@0:4@8{_NSRange=II}12@20' type64='v48@0:8@16{_NSRange=QQ}24@40' selector='speechSynthesizer:willSpeakWord:ofString:'>
-      <arg name='sender' index='0'/>
-      <arg name='characterRange' index='1'/>
-      <arg name='string' index='2'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSSplitViewDelegate'>
-    <method type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}16@0:4@8i12' type64='{CGRect={CGPoint=dd}{CGSize=dd}}32@0:8@16q24' selector='splitView:additionalEffectiveRectOfDividerAtIndex:'>
-      <arg name='splitView' index='0'/>
-      <arg name='dividerIndex' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='splitView:canCollapseSubview:'>
-      <arg name='splitView' index='0'/>
-      <arg name='subview' index='1'/>
-    </method>
-    <method type='f20@0:4@8f12i16' type64='d40@0:8@16d24q32' selector='splitView:constrainMaxCoordinate:ofSubviewAt:'>
-      <arg name='splitView' index='0'/>
-      <arg name='proposedMaximumPosition' index='1'/>
-      <arg name='dividerIndex' index='2'/>
-    </method>
-    <method type='f20@0:4@8f12i16' type64='d40@0:8@16d24q32' selector='splitView:constrainMinCoordinate:ofSubviewAt:'>
-      <arg name='splitView' index='0'/>
-      <arg name='proposedMinimumPosition' index='1'/>
-      <arg name='dividerIndex' index='2'/>
-    </method>
-    <method type='f20@0:4@8f12i16' type64='d40@0:8@16d24q32' selector='splitView:constrainSplitPosition:ofSubviewAt:'>
-      <arg name='splitView' index='0'/>
-      <arg name='proposedPosition' index='1'/>
-      <arg name='dividerIndex' index='2'/>
-    </method>
-    <method type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}48@0:4@8{_NSRect={_NSPoint=ff}{_NSSize=ff}}12{_NSRect={_NSPoint=ff}{_NSSize=ff}}28i44' type64='{CGRect={CGPoint=dd}{CGSize=dd}}96@0:8@16{CGRect={CGPoint=dd}{CGSize=dd}}24{CGRect={CGPoint=dd}{CGSize=dd}}56q88' selector='splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:'>
-      <arg name='splitView' index='0'/>
-      <arg name='proposedEffectiveRect' index='1'/>
-      <arg name='drawnRect' index='2'/>
-      <arg name='dividerIndex' index='3'/>
-    </method>
-    <method type='v20@0:4@8{_NSSize=ff}12' type64='v40@0:8@16{CGSize=dd}24' selector='splitView:resizeSubviewsWithOldSize:'>
-      <arg name='splitView' index='0'/>
-      <arg name='oldSize' index='1'/>
-    </method>
-    <method type='B20@0:4@8@12i16' type64='B40@0:8@16@24q32' selector='splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:'>
-      <arg name='splitView' index='0'/>
-      <arg name='subview' index='1'/>
-      <arg name='dividerIndex' index='2'/>
-    </method>
-    <method type='B16@0:4@8i12' type64='B32@0:8@16q24' selector='splitView:shouldHideDividerAtIndex:'>
-      <arg name='splitView' index='0'/>
-      <arg name='dividerIndex' index='1'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='splitViewDidResizeSubviews:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='splitViewWillResizeSubviews:'>
-      <arg name='notification' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSTabViewDelegate'>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='tabView:didSelectTabViewItem:'>
-      <arg name='tabView' index='0'/>
-      <arg name='tabViewItem' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='tabView:shouldSelectTabViewItem:'>
-      <arg name='tabView' index='0'/>
-      <arg name='tabViewItem' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='tabView:willSelectTabViewItem:'>
-      <arg name='tabView' index='0'/>
-      <arg name='tabViewItem' index='1'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='tabViewDidChangeNumberOfTabViewItems:'>
-      <arg name='TabView' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSTableDataSource'>
-    <method type='i12@0:4@8' type64='q24@0:8@16' selector='numberOfRowsInTableView:'>
-      <arg name='tableView' index='0'/>
-    </method>
-    <method type='B24@0:4@8@12i16I20' type64='B48@0:8@16@24q32Q40' selector='tableView:acceptDrop:row:dropOperation:'>
-      <arg name='tableView' index='0'/>
-      <arg name='info' index='1'/>
-      <arg name='row' index='2'/>
-      <arg name='dropOperation' index='3'/>
-    </method>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='tableView:namesOfPromisedFilesDroppedAtDestination:forDraggedRowsWithIndexes:'>
-      <arg name='tableView' index='0'/>
-      <arg name='dropDestination' index='1'/>
-      <arg name='indexSet' index='2'/>
-    </method>
-    <method type='@20@0:4@8@12i16' type64='@40@0:8@16@24q32' selector='tableView:objectValueForTableColumn:row:'>
-      <arg name='tableView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-      <arg name='row' index='2'/>
-    </method>
-    <method type='v24@0:4@8@12@16i20' type64='v48@0:8@16@24@32q40' selector='tableView:setObjectValue:forTableColumn:row:'>
-      <arg name='tableView' index='0'/>
-      <arg name='object' index='1'/>
-      <arg name='tableColumn' index='2'/>
-      <arg name='row' index='3'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='tableView:sortDescriptorsDidChange:'>
-      <arg name='tableView' index='0'/>
-      <arg name='oldDescriptors' index='1'/>
-    </method>
-    <method type='I24@0:4@8@12i16I20' type64='Q48@0:8@16@24q32Q40' selector='tableView:validateDrop:proposedRow:proposedDropOperation:'>
-      <arg name='tableView' index='0'/>
-      <arg name='info' index='1'/>
-      <arg name='row' index='2'/>
-      <arg name='dropOperation' index='3'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='tableView:writeRows:toPasteboard:'>
-      <arg name='tableView' index='0'/>
-      <arg name='rows' index='1'/>
-      <arg name='pboard' index='2'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='tableView:writeRowsWithIndexes:toPasteboard:'>
-      <arg name='tableView' index='0'/>
-      <arg name='rowIndexes' index='1'/>
-      <arg name='pboard' index='2'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSTableViewDelegate'>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='selectionShouldChangeInTableView:'>
-      <arg name='tableView' index='0'/>
-    </method>
-    <method type='@20@0:4@8@12i16' type64='@40@0:8@16@24q32' selector='tableView:dataCellForTableColumn:row:'>
-      <arg name='tableView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-      <arg name='row' index='2'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='tableView:didClickTableColumn:'>
-      <arg name='tableView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='tableView:didDragTableColumn:'>
-      <arg name='tableView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-    </method>
-    <method type='f16@0:4@8i12' type64='d32@0:8@16q24' selector='tableView:heightOfRow:'>
-      <arg name='tableView' index='0'/>
-      <arg name='row' index='1'/>
-    </method>
-    <method type='B16@0:4@8i12' type64='B32@0:8@16q24' selector='tableView:isGroupRow:'>
-      <arg name='tableView' index='0'/>
-      <arg name='row' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='tableView:mouseDownInHeaderOfTableColumn:'>
-      <arg name='tableView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-    </method>
-    <method type='i24@0:4@8i12i16@20' type64='q48@0:8@16q24q32@40' selector='tableView:nextTypeSelectMatchFromRow:toRow:forString:'>
-      <arg name='tableView' index='0'/>
-      <arg name='startRow' index='1'/>
-      <arg name='endRow' index='2'/>
-      <arg name='searchString' index='3'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='tableView:selectionIndexesForProposedSelection:'>
-      <arg name='tableView' index='0'/>
-      <arg name='proposedSelectionIndexes' index='1'/>
-    </method>
-    <method type='B20@0:4@8@12i16' type64='B40@0:8@16@24q32' selector='tableView:shouldEditTableColumn:row:'>
-      <arg name='tableView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-      <arg name='row' index='2'/>
-    </method>
-    <method type='B16@0:4@8i12' type64='B32@0:8@16q24' selector='tableView:shouldSelectRow:'>
-      <arg name='tableView' index='0'/>
-      <arg name='row' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='tableView:shouldSelectTableColumn:'>
-      <arg name='tableView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-    </method>
-    <method type='B20@0:4@8@12i16' type64='B40@0:8@16@24q32' selector='tableView:shouldShowCellExpansionForTableColumn:row:'>
-      <arg name='tableView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-      <arg name='row' index='2'/>
-    </method>
-    <method type='B24@0:4@8@12@16i20' type64='B48@0:8@16@24@32q40' selector='tableView:shouldTrackCell:forTableColumn:row:'>
-      <arg name='tableView' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='tableColumn' index='2'/>
-      <arg name='row' index='3'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='tableView:shouldTypeSelectForEvent:withCurrentSearchString:'>
-      <arg name='tableView' index='0'/>
-      <arg name='event' index='1'/>
-      <arg name='searchString' index='2'/>
-    </method>
-    <method type='@36@0:4@8@12^{_NSRect={_NSPoint=ff}{_NSSize=ff}}16@20i24{_NSPoint=ff}28' type64='@72@0:8@16@24^{CGRect={CGPoint=dd}{CGSize=dd}}32@40q48{CGPoint=dd}56' selector='tableView:toolTipForCell:rect:tableColumn:row:mouseLocation:'>
-      <arg name='tableView' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='rect' index='2'/>
-      <arg name='tableColumn' index='3'/>
-      <arg name='row' index='4'/>
-      <arg name='mouseLocation' index='5'/>
-    </method>
-    <method type='@20@0:4@8@12i16' type64='@40@0:8@16@24q32' selector='tableView:typeSelectStringForTableColumn:row:'>
-      <arg name='tableView' index='0'/>
-      <arg name='tableColumn' index='1'/>
-      <arg name='row' index='2'/>
-    </method>
-    <method type='v24@0:4@8@12@16i20' type64='v48@0:8@16@24@32q40' selector='tableView:willDisplayCell:forTableColumn:row:'>
-      <arg name='tableView' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='tableColumn' index='2'/>
-      <arg name='row' index='3'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSTableViewNotifications'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='tableViewColumnDidMove:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='tableViewColumnDidResize:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='tableViewSelectionDidChange:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='tableViewSelectionIsChanging:'>
-      <arg name='notification' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSTextDelegate'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='textDidBeginEditing:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='textDidChange:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='textDidEndEditing:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='textShouldBeginEditing:'>
-      <arg name='textObject' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='textShouldEndEditing:'>
-      <arg name='textObject' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSTextStorageDelegate'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='textStorageDidProcessEditing:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='textStorageWillProcessEditing:'>
-      <arg name='notification' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSTextViewDelegate'>
-    <method type='v32@0:4@8@12{_NSRect={_NSPoint=ff}{_NSSize=ff}}16' type64='v64@0:8@16@24{CGRect={CGPoint=dd}{CGSize=dd}}32' selector='textView:clickedOnCell:inRect:'>
-      <arg name='textView' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='cellFrame' index='2'/>
-    </method>
-    <method type='v36@0:4@8@12{_NSRect={_NSPoint=ff}{_NSSize=ff}}16I32' type64='v72@0:8@16@24{CGRect={CGPoint=dd}{CGSize=dd}}32Q64' selector='textView:clickedOnCell:inRect:atIndex:'>
-      <arg name='textView' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='cellFrame' index='2'/>
-      <arg name='charIndex' index='3'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='textView:clickedOnLink:'>
-      <arg name='textView' index='0'/>
-      <arg name='link' index='1'/>
-    </method>
-    <method type='B20@0:4@8@12I16' type64='B40@0:8@16@24Q32' selector='textView:clickedOnLink:atIndex:'>
-      <arg name='textView' index='0'/>
-      <arg name='link' index='1'/>
-      <arg name='charIndex' index='2'/>
-    </method>
-    <method type='@28@0:4@8@12{_NSRange=II}16^i24' type64='@56@0:8@16@24{_NSRange=QQ}32^q48' selector='textView:completions:forPartialWordRange:indexOfSelectedItem:'>
-      <arg name='textView' index='0'/>
-      <arg name='words' index='1'/>
-      <arg name='charRange' index='2'/>
-      <arg name='index' index='3'/>
-    </method>
-    <method type='B16@0:4@8:12' type64='B32@0:8@16:24' selector='textView:doCommandBySelector:'>
-      <arg name='textView' index='0'/>
-      <arg name='commandSelector' index='1'/>
-    </method>
-    <method type='v32@0:4@8@12{_NSRect={_NSPoint=ff}{_NSSize=ff}}16' type64='v64@0:8@16@24{CGRect={CGPoint=dd}{CGSize=dd}}32' selector='textView:doubleClickedOnCell:inRect:'>
-      <arg name='textView' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='cellFrame' index='2'/>
-    </method>
-    <method type='v36@0:4@8@12{_NSRect={_NSPoint=ff}{_NSSize=ff}}16I32' type64='v72@0:8@16@24{CGRect={CGPoint=dd}{CGSize=dd}}32Q64' selector='textView:doubleClickedOnCell:inRect:atIndex:'>
-      <arg name='textView' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='cellFrame' index='2'/>
-      <arg name='charIndex' index='3'/>
-    </method>
-    <method type='v36@0:4@8@12{_NSRect={_NSPoint=ff}{_NSSize=ff}}16@32' type64='v72@0:8@16@24{CGRect={CGPoint=dd}{CGSize=dd}}32@64' selector='textView:draggedCell:inRect:event:'>
-      <arg name='view' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='rect' index='2'/>
-      <arg name='event' index='3'/>
-    </method>
-    <method type='v40@0:4@8@12{_NSRect={_NSPoint=ff}{_NSSize=ff}}16@32I36' type64='v80@0:8@16@24{CGRect={CGPoint=dd}{CGSize=dd}}32@64Q72' selector='textView:draggedCell:inRect:event:atIndex:'>
-      <arg name='view' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='rect' index='2'/>
-      <arg name='event' index='3'/>
-      <arg name='charIndex' index='4'/>
-    </method>
-    <method type='@24@0:4@8@12@16I20' type64='@48@0:8@16@24@32Q40' selector='textView:menu:forEvent:atIndex:'>
-      <arg name='view' index='0'/>
-      <arg name='menu' index='1'/>
-      <arg name='event' index='2'/>
-      <arg name='charIndex' index='3'/>
-    </method>
-    <method type='B24@0:4@8{_NSRange=II}12@20' type64='B48@0:8@16{_NSRange=QQ}24@40' selector='textView:shouldChangeTextInRange:replacementString:'>
-      <arg name='textView' index='0'/>
-      <arg name='affectedCharRange' index='1'/>
-      <arg name='replacementString' index='2'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='textView:shouldChangeTextInRanges:replacementStrings:'>
-      <arg name='textView' index='0'/>
-      <arg name='affectedRanges' index='1'/>
-      <arg name='replacementStrings' index='2'/>
-    </method>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='textView:shouldChangeTypingAttributes:toAttributes:'>
-      <arg name='textView' index='0'/>
-      <arg name='oldTypingAttributes' index='1'/>
-      <arg name='newTypingAttributes' index='2'/>
-    </method>
-    <method type='i24@0:4@8i12{_NSRange=II}16' type64='q48@0:8@16q24{_NSRange=QQ}32' selector='textView:shouldSetSpellingState:range:'>
-      <arg name='textView' index='0'/>
-      <arg name='value' index='1'/>
-      <arg name='affectedCharRange' index='2'/>
-    </method>
-    <method type='{_NSRange=II}28@0:4@8{_NSRange=II}12{_NSRange=II}20' type64='{_NSRange=QQ}56@0:8@16{_NSRange=QQ}24{_NSRange=QQ}40' selector='textView:willChangeSelectionFromCharacterRange:toCharacterRange:'>
-      <arg name='textView' index='0'/>
-      <arg name='oldSelectedCharRange' index='1'/>
-      <arg name='newSelectedCharRange' index='2'/>
-    </method>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='textView:willChangeSelectionFromCharacterRanges:toCharacterRanges:'>
-      <arg name='textView' index='0'/>
-      <arg name='oldSelectedCharRanges' index='1'/>
-      <arg name='newSelectedCharRanges' index='2'/>
-    </method>
-    <method type='@20@0:4@8@12I16' type64='@40@0:8@16@24Q32' selector='textView:willDisplayToolTip:forCharacterAtIndex:'>
-      <arg name='textView' index='0'/>
-      <arg name='tooltip' index='1'/>
-      <arg name='characterIndex' index='2'/>
-    </method>
-    <method type='@20@0:4@8@12I16' type64='@40@0:8@16@24Q32' selector='textView:writablePasteboardTypesForCell:atIndex:'>
-      <arg name='view' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='charIndex' index='2'/>
-    </method>
-    <method type='B28@0:4@8@12I16@20@24' type64='B56@0:8@16@24Q32@40@48' selector='textView:writeCell:atIndex:toPasteboard:type:'>
-      <arg name='view' index='0'/>
-      <arg name='cell' index='1'/>
-      <arg name='charIndex' index='2'/>
-      <arg name='pboard' index='3'/>
-      <arg name='type' index='4'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='textViewDidChangeSelection:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='textViewDidChangeTypingAttributes:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='undoManagerForTextView:'>
-      <arg name='view' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSTokenFieldCellDelegate'>
-    <method type='@24@0:4@8@12i16^i20' type64='@48@0:8@16@24q32^q40' selector='tokenFieldCell:completionsForSubstring:indexOfToken:indexOfSelectedItem:'>
-      <arg name='tokenFieldCell' index='0'/>
-      <arg name='substring' index='1'/>
-      <arg name='tokenIndex' index='2'/>
-      <arg name='selectedIndex' index='3'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='tokenFieldCell:displayStringForRepresentedObject:'>
-      <arg name='tokenFieldCell' index='0'/>
-      <arg name='representedObject' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='tokenFieldCell:editingStringForRepresentedObject:'>
-      <arg name='tokenFieldCell' index='0'/>
-      <arg name='representedObject' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='tokenFieldCell:hasMenuForRepresentedObject:'>
-      <arg name='tokenFieldCell' index='0'/>
-      <arg name='representedObject' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='tokenFieldCell:menuForRepresentedObject:'>
-      <arg name='tokenFieldCell' index='0'/>
-      <arg name='representedObject' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='tokenFieldCell:readFromPasteboard:'>
-      <arg name='tokenFieldCell' index='0'/>
-      <arg name='pboard' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='tokenFieldCell:representedObjectForEditingString:'>
-      <arg name='tokenFieldCell' index='0'/>
-      <arg name='editingString' index='1'/>
-    </method>
-    <method type='@20@0:4@8@12I16' type64='@40@0:8@16@24Q32' selector='tokenFieldCell:shouldAddObjects:atIndex:'>
-      <arg name='tokenFieldCell' index='0'/>
-      <arg name='tokens' index='1'/>
-      <arg name='index' index='2'/>
-    </method>
-    <method type='I16@0:4@8@12' type64='Q32@0:8@16@24' selector='tokenFieldCell:styleForRepresentedObject:'>
-      <arg name='tokenFieldCell' index='0'/>
-      <arg name='representedObject' index='1'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='tokenFieldCell:writeRepresentedObjects:toPasteboard:'>
-      <arg name='tokenFieldCell' index='0'/>
-      <arg name='objects' index='1'/>
-      <arg name='pboard' index='2'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSTokenFieldDelegate'>
-    <method type='@24@0:4@8@12i16^i20' type64='@48@0:8@16@24q32^q40' selector='tokenField:completionsForSubstring:indexOfToken:indexOfSelectedItem:'>
-      <arg name='tokenField' index='0'/>
-      <arg name='substring' index='1'/>
-      <arg name='tokenIndex' index='2'/>
-      <arg name='selectedIndex' index='3'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='tokenField:displayStringForRepresentedObject:'>
-      <arg name='tokenField' index='0'/>
-      <arg name='representedObject' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='tokenField:editingStringForRepresentedObject:'>
-      <arg name='tokenField' index='0'/>
-      <arg name='representedObject' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='tokenField:hasMenuForRepresentedObject:'>
-      <arg name='tokenField' index='0'/>
-      <arg name='representedObject' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='tokenField:menuForRepresentedObject:'>
-      <arg name='tokenField' index='0'/>
-      <arg name='representedObject' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='tokenField:readFromPasteboard:'>
-      <arg name='tokenField' index='0'/>
-      <arg name='pboard' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='tokenField:representedObjectForEditingString:'>
-      <arg name='tokenField' index='0'/>
-      <arg name='editingString' index='1'/>
-    </method>
-    <method type='@20@0:4@8@12I16' type64='@40@0:8@16@24Q32' selector='tokenField:shouldAddObjects:atIndex:'>
-      <arg name='tokenField' index='0'/>
-      <arg name='tokens' index='1'/>
-      <arg name='index' index='2'/>
-    </method>
-    <method type='I16@0:4@8@12' type64='Q32@0:8@16@24' selector='tokenField:styleForRepresentedObject:'>
-      <arg name='tokenField' index='0'/>
-      <arg name='representedObject' index='1'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='tokenField:writeRepresentedObjects:toPasteboard:'>
-      <arg name='tokenField' index='0'/>
-      <arg name='objects' index='1'/>
-      <arg name='pboard' index='2'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSToolTipOwner'>
-    <method type='@28@0:4@8i12{_NSPoint=ff}16^v24' type64='@56@0:8@16q24{CGPoint=dd}32^v48' selector='view:stringForToolTip:point:userData:'>
-      <arg name='view' index='0'/>
-      <arg name='tag' index='1'/>
-      <arg name='point' index='2'/>
-      <arg name='data' index='3'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSToolbarDelegate'>
-    <method type='@20@0:4@8@12B16' type64='@36@0:8@16@24B32' selector='toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:'>
-      <arg name='toolbar' index='0'/>
-      <arg name='itemIdentifier' index='1'/>
-      <arg name='flag' index='2'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='toolbarAllowedItemIdentifiers:'>
-      <arg name='toolbar' index='0'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='toolbarDefaultItemIdentifiers:'>
-      <arg name='toolbar' index='0'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='toolbarSelectableItemIdentifiers:'>
-      <arg name='toolbar' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSToolbarItemValidation'>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='validateToolbarItem:'>
-      <arg name='theItem' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSToolbarNotifications'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='toolbarDidRemoveItem:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='toolbarWillAddItem:'>
-      <arg name='notification' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSWindowDelegate'>
-    <method type='B28@0:4@8@12{_NSPoint=ff}16@24' type64='B56@0:8@16@24{CGPoint=dd}32@48' selector='window:shouldDragDocumentWithEvent:from:withPasteboard:'>
-      <arg name='window' index='0'/>
-      <arg name='event' index='1'/>
-      <arg name='dragImageLocation' index='2'/>
-      <arg name='pasteboard' index='3'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='window:shouldPopUpDocumentPathMenu:'>
-      <arg name='window' index='0'/>
-      <arg name='menu' index='1'/>
-    </method>
-    <method type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}32@0:4@8@12{_NSRect={_NSPoint=ff}{_NSSize=ff}}16' type64='{CGRect={CGPoint=dd}{CGSize=dd}}64@0:8@16@24{CGRect={CGPoint=dd}{CGSize=dd}}32' selector='window:willPositionSheet:usingRect:'>
-      <arg name='window' index='0'/>
-      <arg name='sheet' index='1'/>
-      <arg name='rect' index='2'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='windowShouldClose:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='B28@0:4@8{_NSRect={_NSPoint=ff}{_NSSize=ff}}12' type64='B56@0:8@16{CGRect={CGPoint=dd}{CGSize=dd}}24' selector='windowShouldZoom:toFrame:'>
-      <arg name='window' index='0'/>
-      <arg name='newFrame' index='1'/>
-    </method>
-    <method type='{_NSSize=ff}20@0:4@8{_NSSize=ff}12' type64='{CGSize=dd}40@0:8@16{CGSize=dd}24' selector='windowWillResize:toSize:'>
-      <arg name='sender' index='0'/>
-      <arg name='frameSize' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='windowWillReturnFieldEditor:toObject:'>
-      <arg name='sender' index='0'/>
-      <arg name='client' index='1'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='windowWillReturnUndoManager:'>
-      <arg name='window' index='0'/>
-    </method>
-    <method type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}28@0:4@8{_NSRect={_NSPoint=ff}{_NSSize=ff}}12' type64='{CGRect={CGPoint=dd}{CGSize=dd}}56@0:8@16{CGRect={CGPoint=dd}{CGSize=dd}}24' selector='windowWillUseStandardFrame:defaultFrame:'>
-      <arg name='window' index='0'/>
-      <arg name='newFrame' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSWindowNotifications'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidBecomeKey:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidBecomeMain:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidChangeScreen:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidChangeScreenProfile:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidDeminiaturize:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidEndSheet:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidExpose:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidMiniaturize:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidMove:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidResignKey:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidResignMain:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidResize:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowDidUpdate:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowWillBeginSheet:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowWillClose:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowWillMiniaturize:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='windowWillMove:'>
-      <arg name='notification' index='0'/>
-    </method>
-  </informal_protocol>
-</signatures>
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/FoundationFull.bridgesupport b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/FoundationFull.bridgesupport
deleted file mode 100644
index a55f7514a3..0000000000
--- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/FoundationFull.bridgesupport
+++ /dev/null
@@ -1,13870 +0,0 @@
-<?xml version='1.0'?>
-<signatures version='0.9'>
-  <depends_on path='/System/Library/Frameworks/CoreFoundation.framework'/>
-  <depends_on path='/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CFNetwork.framework'/>
-  <depends_on path='/System/Library/Frameworks/SystemConfiguration.framework'/>
-  <depends_on path='/System/Library/Frameworks/CoreServices.framework'/>
-  <depends_on path='/System/Library/Frameworks/Security.framework'/>
-  <struct name='NSAffineTransformStruct' type='{_NSAffineTransformStruct=&quot;m11&quot;f&quot;m12&quot;f&quot;m21&quot;f&quot;m22&quot;f&quot;tX&quot;f&quot;tY&quot;f}' type64='{_NSAffineTransformStruct=&quot;m11&quot;d&quot;m12&quot;d&quot;m21&quot;d&quot;m22&quot;d&quot;tX&quot;d&quot;tY&quot;d}'>
-    <field name='m11'/>
-    <field name='m12'/>
-    <field name='m21'/>
-    <field name='m22'/>
-    <field name='tX'/>
-    <field name='tY'/>
-  </struct>
-  <struct name='NSDecimal' opaque='true' type='{_NSDecimal=&quot;_exponent&quot;b8&quot;_length&quot;b4&quot;_isNegative&quot;b1&quot;_isCompact&quot;b1&quot;_reserved&quot;b18&quot;_mantissa&quot;[8S]}'>
-    <field name='_exponent'/>
-    <field name='_length'/>
-    <field name='_isNegative'/>
-    <field name='_isCompact'/>
-    <field name='_reserved'/>
-    <field name='_mantissa'/>
-  </struct>
-  <struct name='NSFastEnumerationState' type='{_NSFastEnumerationState=&quot;state&quot;L&quot;itemsPtr&quot;^@&quot;mutationsPtr&quot;^L&quot;extra&quot;[5L]}' type64='{_NSFastEnumerationState=&quot;state&quot;Q&quot;itemsPtr&quot;^@&quot;mutationsPtr&quot;^Q&quot;extra&quot;[5Q]}'>
-    <field name='state'/>
-    <field name='itemsPtr'/>
-    <field name='mutationsPtr'/>
-    <field name='extra'/>
-  </struct>
-  <struct name='NSHashEnumerator' type='{_NSHashEnumerator=&quot;_pi&quot;I&quot;_si&quot;I&quot;_bs&quot;^v}' type64='{_NSHashEnumerator=&quot;_pi&quot;Q&quot;_si&quot;Q&quot;_bs&quot;^v}'>
-    <field name='_pi'/>
-    <field name='_si'/>
-    <field name='_bs'/>
-  </struct>
-  <struct name='NSHashTableCallBacks' type='{_NSHashTableCallBacks=&quot;hash&quot;^?&quot;isEqual&quot;^?&quot;retain&quot;^?&quot;release&quot;^?&quot;describe&quot;^?}'>
-    <field name='hash'/>
-    <field name='isEqual'/>
-    <field name='retain'/>
-    <field name='release'/>
-    <field name='describe'/>
-  </struct>
-  <struct name='NSMapEnumerator' type='{_NSMapEnumerator=&quot;_pi&quot;I&quot;_si&quot;I&quot;_bs&quot;^v}' type64='{_NSMapEnumerator=&quot;_pi&quot;Q&quot;_si&quot;Q&quot;_bs&quot;^v}'>
-    <field name='_pi'/>
-    <field name='_si'/>
-    <field name='_bs'/>
-  </struct>
-  <struct name='NSMapTableKeyCallBacks' type='{_NSMapTableKeyCallBacks=&quot;hash&quot;^?&quot;isEqual&quot;^?&quot;retain&quot;^?&quot;release&quot;^?&quot;describe&quot;^?&quot;notAKeyMarker&quot;^v}'>
-    <field name='hash'/>
-    <field name='isEqual'/>
-    <field name='retain'/>
-    <field name='release'/>
-    <field name='describe'/>
-    <field name='notAKeyMarker'/>
-  </struct>
-  <struct name='NSMapTableValueCallBacks' type='{_NSMapTableValueCallBacks=&quot;retain&quot;^?&quot;release&quot;^?&quot;describe&quot;^?}'>
-    <field name='retain'/>
-    <field name='release'/>
-    <field name='describe'/>
-  </struct>
-  <struct name='NSPoint' type='{_NSPoint=&quot;x&quot;f&quot;y&quot;f}' type64='{CGPoint=&quot;x&quot;d&quot;y&quot;d}'>
-    <field name='x'/>
-    <field name='y'/>
-  </struct>
-  <struct name='NSRange' type='{_NSRange=&quot;location&quot;I&quot;length&quot;I}' type64='{_NSRange=&quot;location&quot;Q&quot;length&quot;Q}'>
-    <field name='location'/>
-    <field name='length'/>
-  </struct>
-  <struct name='NSRect' type='{_NSRect=&quot;origin&quot;{_NSPoint=&quot;x&quot;f&quot;y&quot;f}&quot;size&quot;{_NSSize=&quot;width&quot;f&quot;height&quot;f}}' type64='{CGRect=&quot;origin&quot;{CGPoint=&quot;x&quot;d&quot;y&quot;d}&quot;size&quot;{CGSize=&quot;width&quot;d&quot;height&quot;d}}'>
-    <field name='origin'/>
-    <field name='size'/>
-  </struct>
-  <struct name='NSSize' type='{_NSSize=&quot;width&quot;f&quot;height&quot;f}' type64='{CGSize=&quot;width&quot;d&quot;height&quot;d}'>
-    <field name='width'/>
-    <field name='height'/>
-  </struct>
-  <struct name='NSSwappedDouble' type='{_NSSwappedDouble=&quot;v&quot;Q}'>
-    <field name='v'/>
-  </struct>
-  <struct name='NSSwappedFloat' type='{_NSSwappedFloat=&quot;v&quot;I}'>
-    <field name='v'/>
-  </struct>
-  <opaque name='NSZone' type='^{_NSZone=}'/>
-  <constant name='NSAppleEventManagerWillProcessFirstEventNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSAppleEventTimeOutDefault' declared_type='double' type='d' const='true'/>
-  <constant name='NSAppleEventTimeOutNone' declared_type='double' type='d' const='true'/>
-  <constant name='NSAppleScriptErrorAppName' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAppleScriptErrorBriefMessage' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAppleScriptErrorMessage' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAppleScriptErrorNumber' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAppleScriptErrorRange' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSArgumentDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSAverageKeyValueOperator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSBuddhistCalendar' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSBundleDidLoadNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSCharacterConversionException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSChineseCalendar' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSClassDescriptionNeededForClassNotification' declared_type='NSString*' type='@'/>
-  <constant name='NSCocoaErrorDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSConnectionDidDieNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSConnectionDidInitializeNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSConnectionReplyMode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSCountKeyValueOperator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSCurrentLocaleDidChangeNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSDeallocateZombies' declared_type='BOOL' type='B'/>
-  <constant name='NSDebugEnabled' declared_type='BOOL' type='B'/>
-  <constant name='NSDecimalNumberDivideByZeroException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSDecimalNumberExactnessException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSDecimalNumberOverflowException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSDecimalNumberUnderflowException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSDefaultRunLoopMode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSDestinationInvalidException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSDidBecomeSingleThreadedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSDistinctUnionOfArraysKeyValueOperator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSDistinctUnionOfObjectsKeyValueOperator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSDistinctUnionOfSetsKeyValueOperator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSErrorFailingURLStringKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFailedAuthenticationException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileAppendOnly' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileBusy' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileCreationDate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileDeviceIdentifier' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileExtensionHidden' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileGroupOwnerAccountID' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileGroupOwnerAccountName' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileHFSCreatorCode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileHFSTypeCode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileHandleConnectionAcceptedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileHandleDataAvailableNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileHandleNotificationDataItem' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileHandleNotificationFileHandleItem' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileHandleNotificationMonitorModes' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileHandleOperationException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileHandleReadCompletionNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileHandleReadToEndOfFileCompletionNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileImmutable' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileModificationDate' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileOwnerAccountID' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileOwnerAccountName' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFilePathErrorKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFilePosixPermissions' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileReferenceCount' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileSize' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileSystemFileNumber' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileSystemFreeNodes' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileSystemFreeSize' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileSystemNodes' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileSystemNumber' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileSystemSize' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileType' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileTypeBlockSpecial' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileTypeCharacterSpecial' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileTypeDirectory' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileTypeRegular' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileTypeSocket' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileTypeSymbolicLink' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFileTypeUnknown' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSFoundationVersionNumber' declared_type='double' type='d'/>
-  <constant name='NSGenericException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSGlobalDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSGrammarCorrections' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSGrammarRange' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSGrammarUserDescription' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSGregorianCalendar' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieComment' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieCommentURL' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieDiscard' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieExpires' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieManagerAcceptPolicyChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieManagerCookiesChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieMaximumAge' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieName' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieOriginURL' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookiePath' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookiePort' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieSecure' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieValue' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHTTPCookieVersion' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSHangOnUncaughtException' declared_type='BOOL' type='B'/>
-  <constant name='NSHebrewCalendar' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSInconsistentArchiveException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSIntegerHashCallBacks' declared_type='NSHashTableCallBacks' type='{_NSHashTableCallBacks=^?^?^?^?^?}' const='true'/>
-  <constant name='NSIntegerMapKeyCallBacks' declared_type='NSMapTableKeyCallBacks' type='{_NSMapTableKeyCallBacks=^?^?^?^?^?^v}' const='true'/>
-  <constant name='NSIntegerMapValueCallBacks' declared_type='NSMapTableValueCallBacks' type='{_NSMapTableValueCallBacks=^?^?^?}' const='true'/>
-  <constant name='NSInternalInconsistencyException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSInvalidArchiveOperationException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSInvalidArgumentException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSInvalidReceivePortException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSInvalidSendPortException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSInvalidUnarchiveOperationException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSInvocationOperationCancelledException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSInvocationOperationVoidResultException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSIsNilTransformerName' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSIsNotNilTransformerName' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSIslamicCalendar' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSIslamicCivilCalendar' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSJapaneseCalendar' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSKeepAllocationStatistics' declared_type='BOOL' type='B'/>
-  <constant name='NSKeyValueChangeIndexesKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSKeyValueChangeKindKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSKeyValueChangeNewKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSKeyValueChangeNotificationIsPriorKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSKeyValueChangeOldKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSKeyedUnarchiveFromDataTransformerName' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLoadedClasses' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocalNotificationCenterType' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleCalendar' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleCollationIdentifier' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleCountryCode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleCurrencyCode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleCurrencySymbol' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleDecimalSeparator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleExemplarCharacterSet' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleGroupingSeparator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleIdentifier' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleLanguageCode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleMeasurementSystem' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleScriptCode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleUsesMetricSystem' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocaleVariantCode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocalizedDescriptionKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocalizedFailureReasonErrorKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocalizedRecoveryOptionsErrorKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSLocalizedRecoverySuggestionErrorKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSMachErrorDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSMallocException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSMaximumKeyValueOperator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSMetadataQueryDidFinishGatheringNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSMetadataQueryDidStartGatheringNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSMetadataQueryDidUpdateNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSMetadataQueryGatheringProgressNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSMetadataQueryLocalComputerScope' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSMetadataQueryNetworkScope' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSMetadataQueryResultContentRelevanceAttribute' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSMetadataQueryUserHomeScope' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSMinimumKeyValueOperator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSNegateBooleanTransformerName' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSNetServicesErrorCode' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSNetServicesErrorDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSNonOwnedPointerHashCallBacks' declared_type='NSHashTableCallBacks' type='{_NSHashTableCallBacks=^?^?^?^?^?}' const='true'/>
-  <constant name='NSNonOwnedPointerMapKeyCallBacks' declared_type='NSMapTableKeyCallBacks' type='{_NSMapTableKeyCallBacks=^?^?^?^?^?^v}' const='true'/>
-  <constant name='NSNonOwnedPointerMapValueCallBacks' declared_type='NSMapTableValueCallBacks' type='{_NSMapTableValueCallBacks=^?^?^?}' const='true'/>
-  <constant name='NSNonOwnedPointerOrNullMapKeyCallBacks' declared_type='NSMapTableKeyCallBacks' type='{_NSMapTableKeyCallBacks=^?^?^?^?^?^v}' const='true'/>
-  <constant name='NSNonRetainedObjectHashCallBacks' declared_type='NSHashTableCallBacks' type='{_NSHashTableCallBacks=^?^?^?^?^?}' const='true'/>
-  <constant name='NSNonRetainedObjectMapKeyCallBacks' declared_type='NSMapTableKeyCallBacks' type='{_NSMapTableKeyCallBacks=^?^?^?^?^?^v}' const='true'/>
-  <constant name='NSNonRetainedObjectMapValueCallBacks' declared_type='NSMapTableValueCallBacks' type='{_NSMapTableValueCallBacks=^?^?^?}' const='true'/>
-  <constant name='NSOSStatusErrorDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSObjectHashCallBacks' declared_type='NSHashTableCallBacks' type='{_NSHashTableCallBacks=^?^?^?^?^?}' const='true'/>
-  <constant name='NSObjectInaccessibleException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSObjectMapKeyCallBacks' declared_type='NSMapTableKeyCallBacks' type='{_NSMapTableKeyCallBacks=^?^?^?^?^?^v}' const='true'/>
-  <constant name='NSObjectMapValueCallBacks' declared_type='NSMapTableValueCallBacks' type='{_NSMapTableValueCallBacks=^?^?^?}' const='true'/>
-  <constant name='NSObjectNotAvailableException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSOldStyleException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSOperationNotSupportedForKeyException' declared_type='NSString*' type='@'/>
-  <constant name='NSOwnedObjectIdentityHashCallBacks' declared_type='NSHashTableCallBacks' type='{_NSHashTableCallBacks=^?^?^?^?^?}' const='true'/>
-  <constant name='NSOwnedPointerHashCallBacks' declared_type='NSHashTableCallBacks' type='{_NSHashTableCallBacks=^?^?^?^?^?}' const='true'/>
-  <constant name='NSOwnedPointerMapKeyCallBacks' declared_type='NSMapTableKeyCallBacks' type='{_NSMapTableKeyCallBacks=^?^?^?^?^?^v}' const='true'/>
-  <constant name='NSOwnedPointerMapValueCallBacks' declared_type='NSMapTableValueCallBacks' type='{_NSMapTableValueCallBacks=^?^?^?}' const='true'/>
-  <constant name='NSPOSIXErrorDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSParseErrorException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSPointerToStructHashCallBacks' declared_type='NSHashTableCallBacks' type='{_NSHashTableCallBacks=^?^?^?^?^?}' const='true'/>
-  <constant name='NSPortDidBecomeInvalidNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSPortReceiveException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSPortSendException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSPortTimeoutException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSRangeException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSRecoveryAttempterErrorKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSRegistrationDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSRunLoopCommonModes' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamDataWrittenToMemoryStreamKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamFileCurrentOffsetKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSOCKSErrorDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSOCKSProxyConfigurationKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSOCKSProxyHostKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSOCKSProxyPasswordKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSOCKSProxyPortKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSOCKSProxyUserKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSOCKSProxyVersion4' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSOCKSProxyVersion5' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSOCKSProxyVersionKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSocketSSLErrorDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSocketSecurityLevelKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSocketSecurityLevelNegotiatedSSL' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSocketSecurityLevelNone' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSocketSecurityLevelSSLv2' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSocketSecurityLevelSSLv3' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStreamSocketSecurityLevelTLSv1' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSStringEncodingErrorKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSumKeyValueOperator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSSystemTimeZoneDidChangeNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSTaskDidTerminateNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSThreadWillExitNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSURLAuthenticationMethodDefault' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSURLAuthenticationMethodHTMLForm' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSURLAuthenticationMethodHTTPBasic' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSURLAuthenticationMethodHTTPDigest' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSURLCredentialStorageChangedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSURLErrorDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSURLErrorKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSURLFileScheme' declared_type='NSString*' type='@'/>
-  <constant name='NSURLProtectionSpaceFTPProxy' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSURLProtectionSpaceHTTPProxy' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSURLProtectionSpaceHTTPSProxy' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSURLProtectionSpaceSOCKSProxy' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUnarchiveFromDataTransformerName' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUndefinedKeyException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUnderlyingErrorKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUndoManagerCheckpointNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUndoManagerDidOpenUndoGroupNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUndoManagerDidRedoChangeNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUndoManagerDidUndoChangeNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUndoManagerWillCloseUndoGroupNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUndoManagerWillRedoChangeNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUndoManagerWillUndoChangeNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUnionOfArraysKeyValueOperator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUnionOfObjectsKeyValueOperator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUnionOfSetsKeyValueOperator' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSUserDefaultsDidChangeNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSWillBecomeMultiThreadedNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSXMLParserErrorDomain' declared_type='NSString*' type='@' const='true'/>
-  <constant name='NSZeroPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' const='true'/>
-  <constant name='NSZeroRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' const='true'/>
-  <constant name='NSZeroSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' const='true'/>
-  <constant name='NSZombieEnabled' declared_type='BOOL' type='B'/>
-  <enum name='NSASCIIStringEncoding' value='1'/>
-  <enum name='NSAdminApplicationDirectory' value='4'/>
-  <enum name='NSAggregateExpressionType' value='14'/>
-  <enum name='NSAllApplicationsDirectory' value='100'/>
-  <enum name='NSAllDomainsMask' value='65535'/>
-  <enum name='NSAllLibrariesDirectory' value='101'/>
-  <enum name='NSAllPredicateModifier' value='1'/>
-  <enum name='NSAnchoredSearch' value='8'/>
-  <enum name='NSAndPredicateType' value='1'/>
-  <enum name='NSAnyPredicateModifier' value='2'/>
-  <enum name='NSApplicationDirectory' value='1'/>
-  <enum name='NSApplicationSupportDirectory' value='14'/>
-  <enum name='NSArgumentEvaluationScriptError' value='3'/>
-  <enum name='NSArgumentsWrongScriptError' value='6'/>
-  <enum name='NSAtomicWrite' value='1'/>
-  <enum name='NSBackwardsSearch' value='4'/>
-  <enum name='NSBeginsWithComparison' value='5'/>
-  <enum name='NSBeginsWithPredicateOperatorType' value='8'/>
-  <enum name='NSBetweenPredicateOperatorType' value='100'/>
-  <enum name='NSBundleExecutableArchitectureI386' value='7'/>
-  <enum name='NSBundleExecutableArchitecturePPC' value='18'/>
-  <enum name='NSBundleExecutableArchitecturePPC64' value='16777234'/>
-  <enum name='NSBundleExecutableArchitectureX86_64' value='16777223'/>
-  <enum name='NSCachesDirectory' value='13'/>
-  <enum name='NSCalculationDivideByZero' value='4'/>
-  <enum name='NSCalculationLossOfPrecision' value='1'/>
-  <enum name='NSCalculationNoError' value='0'/>
-  <enum name='NSCalculationOverflow' value='3'/>
-  <enum name='NSCalculationUnderflow' value='2'/>
-  <enum name='NSCannotCreateScriptCommandError' value='10'/>
-  <enum name='NSCaseInsensitivePredicateOption' value='1'/>
-  <enum name='NSCaseInsensitiveSearch' value='1'/>
-  <enum name='NSCollectorDisabledOption' value='2'/>
-  <enum name='NSConstantValueExpressionType' value='0'/>
-  <enum name='NSContainerSpecifierError' value='2'/>
-  <enum name='NSContainsComparison' value='7'/>
-  <enum name='NSContainsPredicateOperatorType' value='99'/>
-  <enum name='NSCoreServiceDirectory' value='10'/>
-  <enum name='NSCustomSelectorPredicateOperatorType' value='11'/>
-  <enum name='NSDateFormatterBehavior10_0' value='1000'/>
-  <enum name='NSDateFormatterBehavior10_4' value='1040'/>
-  <enum name='NSDateFormatterBehaviorDefault' value='0'/>
-  <enum name='NSDateFormatterFullStyle' value='4'/>
-  <enum name='NSDateFormatterLongStyle' value='3'/>
-  <enum name='NSDateFormatterMediumStyle' value='2'/>
-  <enum name='NSDateFormatterNoStyle' value='0'/>
-  <enum name='NSDateFormatterShortStyle' value='1'/>
-  <enum name='NSDayCalendarUnit' value='16'/>
-  <enum name='NSDecimalMaxSize' value='8'/>
-  <enum name='NSDecimalNoScale' value='32767'/>
-  <enum name='NSDemoApplicationDirectory' value='2'/>
-  <enum name='NSDesktopDirectory' value='12'/>
-  <enum name='NSDeveloperApplicationDirectory' value='3'/>
-  <enum name='NSDeveloperDirectory' value='6'/>
-  <enum name='NSDiacriticInsensitivePredicateOption' value='2'/>
-  <enum name='NSDiacriticInsensitiveSearch' value='128'/>
-  <enum name='NSDirectPredicateModifier' value='0'/>
-  <enum name='NSDocumentDirectory' value='9'/>
-  <enum name='NSDocumentationDirectory' value='8'/>
-  <enum name='NSDownloadsDirectory' value='15'/>
-  <enum name='NSEndsWithComparison' value='6'/>
-  <enum name='NSEndsWithPredicateOperatorType' value='9'/>
-  <enum name='NSEqualToComparison' value='0'/>
-  <enum name='NSEqualToPredicateOperatorType' value='4'/>
-  <enum name='NSEraCalendarUnit' value='2'/>
-  <enum name='NSEvaluatedObjectExpressionType' value='1'/>
-  <enum name='NSEverySubelement' value='1'/>
-  <enum name='NSExecutableArchitectureMismatchError' value='3585'/>
-  <enum name='NSExecutableErrorMaximum' value='3839'/>
-  <enum name='NSExecutableErrorMinimum' value='3584'/>
-  <enum name='NSExecutableLinkError' value='3588'/>
-  <enum name='NSExecutableLoadError' value='3587'/>
-  <enum name='NSExecutableNotLoadableError' value='3584'/>
-  <enum name='NSExecutableRuntimeMismatchError' value='3586'/>
-  <enum name='NSFileErrorMaximum' value='1023'/>
-  <enum name='NSFileErrorMinimum' value='0'/>
-  <enum name='NSFileLockingError' value='255'/>
-  <enum name='NSFileNoSuchFileError' value='4'/>
-  <enum name='NSFileReadCorruptFileError' value='259'/>
-  <enum name='NSFileReadInapplicableStringEncodingError' value='261'/>
-  <enum name='NSFileReadInvalidFileNameError' value='258'/>
-  <enum name='NSFileReadNoPermissionError' value='257'/>
-  <enum name='NSFileReadNoSuchFileError' value='260'/>
-  <enum name='NSFileReadTooLargeError' value='263'/>
-  <enum name='NSFileReadUnknownError' value='256'/>
-  <enum name='NSFileReadUnknownStringEncodingError' value='264'/>
-  <enum name='NSFileReadUnsupportedSchemeError' value='262'/>
-  <enum name='NSFileWriteInapplicableStringEncodingError' value='517'/>
-  <enum name='NSFileWriteInvalidFileNameError' value='514'/>
-  <enum name='NSFileWriteNoPermissionError' value='513'/>
-  <enum name='NSFileWriteOutOfSpaceError' value='640'/>
-  <enum name='NSFileWriteUnknownError' value='512'/>
-  <enum name='NSFileWriteUnsupportedSchemeError' value='518'/>
-  <enum name='NSForcedOrderingSearch' value='512'/>
-  <enum name='NSFormattingError' value='2048'/>
-  <enum name='NSFormattingErrorMaximum' value='2559'/>
-  <enum name='NSFormattingErrorMinimum' value='2048'/>
-  <enum name='NSFoundationVersionNumber10_0' value='397.39999999999998'/>
-  <enum name='NSFoundationVersionNumber10_1' value='425.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_1_1' value='425.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_1_2' value='425.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_1_3' value='425.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_1_4' value='425.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_2' value='462.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_2_1' value='462.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_2_2' value='462.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_2_3' value='462.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_2_4' value='462.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_2_5' value='462.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_2_6' value='462.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_2_7' value='462.69999999999999'/>
-  <enum name='NSFoundationVersionNumber10_2_8' value='462.69999999999999'/>
-  <enum name='NSFoundationVersionNumber10_3' value='500.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_3_1' value='500.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_3_2' value='500.30000000000001'/>
-  <enum name='NSFoundationVersionNumber10_3_3' value='500.54000000000002'/>
-  <enum name='NSFoundationVersionNumber10_3_4' value='500.56000000000000'/>
-  <enum name='NSFoundationVersionNumber10_3_5' value='500.56000000000000'/>
-  <enum name='NSFoundationVersionNumber10_3_6' value='500.56000000000000'/>
-  <enum name='NSFoundationVersionNumber10_3_7' value='500.56000000000000'/>
-  <enum name='NSFoundationVersionNumber10_3_8' value='500.56000000000000'/>
-  <enum name='NSFoundationVersionNumber10_3_9' value='500.57999999999998'/>
-  <enum name='NSFoundationVersionNumber10_4' value='567.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_4_1' value='567.00000000000000'/>
-  <enum name='NSFoundationVersionNumber10_4_10' value='567.28999999999996'/>
-  <enum name='NSFoundationVersionNumber10_4_11' value='567.36000000000001'/>
-  <enum name='NSFoundationVersionNumber10_4_2' value='567.12000000000000'/>
-  <enum name='NSFoundationVersionNumber10_4_3' value='567.21000000000004'/>
-  <enum name='NSFoundationVersionNumber10_4_4_Intel' value='567.23000000000002'/>
-  <enum name='NSFoundationVersionNumber10_4_4_PowerPC' value='567.21000000000004'/>
-  <enum name='NSFoundationVersionNumber10_4_5' value='567.25000000000000'/>
-  <enum name='NSFoundationVersionNumber10_4_6' value='567.25999999999999'/>
-  <enum name='NSFoundationVersionNumber10_4_7' value='567.26999999999998'/>
-  <enum name='NSFoundationVersionNumber10_4_8' value='567.27999999999997'/>
-  <enum name='NSFoundationVersionNumber10_4_9' value='567.28999999999996'/>
-  <enum name='NSFoundationVersionWithFileManagerResourceForkSupport' value='412'/>
-  <enum name='NSFunctionExpressionType' value='4'/>
-  <enum name='NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES' value64='1'/>
-  <enum name='NSGreaterThanComparison' value='4'/>
-  <enum name='NSGreaterThanOrEqualToComparison' value='3'/>
-  <enum name='NSGreaterThanOrEqualToPredicateOperatorType' value='3'/>
-  <enum name='NSGreaterThanPredicateOperatorType' value='2'/>
-  <enum name='NSHPUXOperatingSystem' value='4'/>
-  <enum name='NSHTTPCookieAcceptPolicyAlways' value='0'/>
-  <enum name='NSHTTPCookieAcceptPolicyNever' value='1'/>
-  <enum name='NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain' value='2'/>
-  <enum name='NSHashTableCopyIn' value='65536'/>
-  <enum name='NSHashTableObjectPointerPersonality' value='512'/>
-  <enum name='NSHashTableStrongMemory' value='0'/>
-  <enum name='NSHashTableZeroingWeakMemory' value='1'/>
-  <enum name='NSHourCalendarUnit' value='32'/>
-  <enum name='NSINTEGER_DEFINED' value='1'/>
-  <enum name='NSISO2022JPStringEncoding' value='21'/>
-  <enum name='NSISOLatin1StringEncoding' value='5'/>
-  <enum name='NSISOLatin2StringEncoding' value='9'/>
-  <enum name='NSInPredicateOperatorType' value='10'/>
-  <enum name='NSIndexSubelement' value='0'/>
-  <enum name='NSIntegerMax' value64='9223372036854775807' value='2147483647'/>
-  <enum name='NSIntegerMin' value64='-9223372036854775808' value='-2147483648'/>
-  <enum name='NSInternalScriptError' value='8'/>
-  <enum name='NSInternalSpecifierError' value='5'/>
-  <enum name='NSIntersectSetExpressionType' value='6'/>
-  <enum name='NSInvalidIndexSpecifierError' value='4'/>
-  <enum name='NSJapaneseEUCStringEncoding' value='3'/>
-  <enum name='NSKeyPathExpressionType' value='3'/>
-  <enum name='NSKeySpecifierEvaluationScriptError' value='2'/>
-  <enum name='NSKeyValueChangeInsertion' value='2'/>
-  <enum name='NSKeyValueChangeRemoval' value='3'/>
-  <enum name='NSKeyValueChangeReplacement' value='4'/>
-  <enum name='NSKeyValueChangeSetting' value='1'/>
-  <enum name='NSKeyValueIntersectSetMutation' value='3'/>
-  <enum name='NSKeyValueMinusSetMutation' value='2'/>
-  <enum name='NSKeyValueObservingOptionInitial' value='4'/>
-  <enum name='NSKeyValueObservingOptionNew' value='1'/>
-  <enum name='NSKeyValueObservingOptionOld' value='2'/>
-  <enum name='NSKeyValueObservingOptionPrior' value='8'/>
-  <enum name='NSKeyValueSetSetMutation' value='4'/>
-  <enum name='NSKeyValueUnionSetMutation' value='1'/>
-  <enum name='NSKeyValueValidationError' value='1024'/>
-  <enum name='NSLessThanComparison' value='2'/>
-  <enum name='NSLessThanOrEqualToComparison' value='1'/>
-  <enum name='NSLessThanOrEqualToPredicateOperatorType' value='1'/>
-  <enum name='NSLessThanPredicateOperatorType' value='0'/>
-  <enum name='NSLibraryDirectory' value='5'/>
-  <enum name='NSLikePredicateOperatorType' value='7'/>
-  <enum name='NSLiteralSearch' value='2'/>
-  <enum name='NSLocalDomainMask' value='2'/>
-  <enum name='NSMACHOperatingSystem' value='5'/>
-  <enum name='NSMacOSRomanStringEncoding' value='30'/>
-  <enum name='NSMachPortDeallocateNone' value='0'/>
-  <enum name='NSMachPortDeallocateReceiveRight' value='2'/>
-  <enum name='NSMachPortDeallocateSendRight' value='1'/>
-  <enum name='NSMapTableCopyIn' value='65536'/>
-  <enum name='NSMapTableObjectPointerPersonality' value='512'/>
-  <enum name='NSMapTableStrongMemory' value='0'/>
-  <enum name='NSMapTableZeroingWeakMemory' value='1'/>
-  <enum name='NSMappedRead' value='1'/>
-  <enum name='NSMatchesPredicateOperatorType' value='6'/>
-  <enum name='NSMaxXEdge' value='2'/>
-  <enum name='NSMaxYEdge' value='3'/>
-  <enum name='NSMiddleSubelement' value='2'/>
-  <enum name='NSMinXEdge' value='0'/>
-  <enum name='NSMinYEdge' value='1'/>
-  <enum name='NSMinusSetExpressionType' value='7'/>
-  <enum name='NSMinuteCalendarUnit' value='64'/>
-  <enum name='NSMonthCalendarUnit' value='8'/>
-  <enum name='NSNEXTSTEPStringEncoding' value='2'/>
-  <enum name='NSNetServiceNoAutoRename' value='1'/>
-  <enum name='NSNetServicesActivityInProgress' value='-72003'/>
-  <enum name='NSNetServicesBadArgumentError' value='-72004'/>
-  <enum name='NSNetServicesCancelledError' value='-72005'/>
-  <enum name='NSNetServicesCollisionError' value='-72001'/>
-  <enum name='NSNetServicesInvalidError' value='-72006'/>
-  <enum name='NSNetServicesNotFoundError' value='-72002'/>
-  <enum name='NSNetServicesTimeoutError' value='-72007'/>
-  <enum name='NSNetServicesUnknownError' value='-72000'/>
-  <enum name='NSNetworkDomainMask' value='4'/>
-  <enum name='NSNoScriptError' value='0'/>
-  <enum name='NSNoSpecifierError' value='0'/>
-  <enum name='NSNoSubelement' value='4'/>
-  <enum name='NSNoTopLevelContainersSpecifierError' value='1'/>
-  <enum name='NSNonLossyASCIIStringEncoding' value='7'/>
-  <enum name='NSNotEqualToPredicateOperatorType' value='5'/>
-  <enum name='NSNotFound' value64='-1' value='2147483647'/>
-  <enum name='NSNotPredicateType' value='0'/>
-  <enum name='NSNotificationCoalescingOnName' value='1'/>
-  <enum name='NSNotificationCoalescingOnSender' value='2'/>
-  <enum name='NSNotificationDeliverImmediately' value='1'/>
-  <enum name='NSNotificationNoCoalescing' value='0'/>
-  <enum name='NSNotificationPostToAllSessions' value='2'/>
-  <enum name='NSNotificationSuspensionBehaviorCoalesce' value='2'/>
-  <enum name='NSNotificationSuspensionBehaviorDeliverImmediately' value='4'/>
-  <enum name='NSNotificationSuspensionBehaviorDrop' value='1'/>
-  <enum name='NSNotificationSuspensionBehaviorHold' value='3'/>
-  <enum name='NSNumberFormatterBehavior10_0' value='1000'/>
-  <enum name='NSNumberFormatterBehavior10_4' value='1040'/>
-  <enum name='NSNumberFormatterBehaviorDefault' value='0'/>
-  <enum name='NSNumberFormatterCurrencyStyle' value='2'/>
-  <enum name='NSNumberFormatterDecimalStyle' value='1'/>
-  <enum name='NSNumberFormatterNoStyle' value='0'/>
-  <enum name='NSNumberFormatterPadAfterPrefix' value='1'/>
-  <enum name='NSNumberFormatterPadAfterSuffix' value='3'/>
-  <enum name='NSNumberFormatterPadBeforePrefix' value='0'/>
-  <enum name='NSNumberFormatterPadBeforeSuffix' value='2'/>
-  <enum name='NSNumberFormatterPercentStyle' value='3'/>
-  <enum name='NSNumberFormatterRoundCeiling' value='0'/>
-  <enum name='NSNumberFormatterRoundDown' value='2'/>
-  <enum name='NSNumberFormatterRoundFloor' value='1'/>
-  <enum name='NSNumberFormatterRoundHalfDown' value='5'/>
-  <enum name='NSNumberFormatterRoundHalfEven' value='4'/>
-  <enum name='NSNumberFormatterRoundHalfUp' value='6'/>
-  <enum name='NSNumberFormatterRoundUp' value='3'/>
-  <enum name='NSNumberFormatterScientificStyle' value='4'/>
-  <enum name='NSNumberFormatterSpellOutStyle' value='5'/>
-  <enum name='NSNumericSearch' value='64'/>
-  <enum name='NSOSF1OperatingSystem' value='7'/>
-  <enum name='NSObjCArrayType' value='91'/>
-  <enum name='NSObjCBitfield' value='98'/>
-  <enum name='NSObjCBoolType' value='66'/>
-  <enum name='NSObjCCharType' value='99'/>
-  <enum name='NSObjCDoubleType' value='100'/>
-  <enum name='NSObjCFloatType' value='102'/>
-  <enum name='NSObjCLongType' value='108'/>
-  <enum name='NSObjCLonglongType' value='113'/>
-  <enum name='NSObjCNoType' value='0'/>
-  <enum name='NSObjCObjectType' value='64'/>
-  <enum name='NSObjCPointerType' value='94'/>
-  <enum name='NSObjCSelectorType' value='58'/>
-  <enum name='NSObjCShortType' value='115'/>
-  <enum name='NSObjCStringType' value='42'/>
-  <enum name='NSObjCStructType' value='123'/>
-  <enum name='NSObjCUnionType' value='40'/>
-  <enum name='NSObjCVoidType' value='118'/>
-  <enum name='NSObjectAutoreleasedEvent' value='3'/>
-  <enum name='NSObjectExtraRefDecrementedEvent' value='5'/>
-  <enum name='NSObjectExtraRefIncrementedEvent' value='4'/>
-  <enum name='NSObjectInternalRefDecrementedEvent' value='7'/>
-  <enum name='NSObjectInternalRefIncrementedEvent' value='6'/>
-  <enum name='NSOpenStepUnicodeReservedBase' value='62464'/>
-  <enum name='NSOperationNotSupportedForKeyScriptError' value='9'/>
-  <enum name='NSOperationNotSupportedForKeySpecifierError' value='6'/>
-  <enum name='NSOperationQueueDefaultMaxConcurrentOperationCount' value='-1'/>
-  <enum name='NSOperationQueuePriorityHigh' value='4'/>
-  <enum name='NSOperationQueuePriorityLow' value='-4'/>
-  <enum name='NSOperationQueuePriorityNormal' value='0'/>
-  <enum name='NSOperationQueuePriorityVeryHigh' value='8'/>
-  <enum name='NSOperationQueuePriorityVeryLow' value='-8'/>
-  <enum name='NSOrPredicateType' value='2'/>
-  <enum name='NSOrderedAscending' value='-1'/>
-  <enum name='NSOrderedDescending' value='1'/>
-  <enum name='NSOrderedSame' value='0'/>
-  <enum name='NSPointerFunctionsCStringPersonality' value='768'/>
-  <enum name='NSPointerFunctionsCopyIn' value='65536'/>
-  <enum name='NSPointerFunctionsIntegerPersonality' value='1280'/>
-  <enum name='NSPointerFunctionsMachVirtualMemory' value='4'/>
-  <enum name='NSPointerFunctionsMallocMemory' value='3'/>
-  <enum name='NSPointerFunctionsObjectPersonality' value='0'/>
-  <enum name='NSPointerFunctionsObjectPointerPersonality' value='512'/>
-  <enum name='NSPointerFunctionsOpaqueMemory' value='2'/>
-  <enum name='NSPointerFunctionsOpaquePersonality' value='256'/>
-  <enum name='NSPointerFunctionsStrongMemory' value='0'/>
-  <enum name='NSPointerFunctionsStructPersonality' value='1024'/>
-  <enum name='NSPointerFunctionsZeroingWeakMemory' value='1'/>
-  <enum name='NSPositionAfter' value='0'/>
-  <enum name='NSPositionBefore' value='1'/>
-  <enum name='NSPositionBeginning' value='2'/>
-  <enum name='NSPositionEnd' value='3'/>
-  <enum name='NSPositionReplace' value='4'/>
-  <enum name='NSPostASAP' value='2'/>
-  <enum name='NSPostNow' value='3'/>
-  <enum name='NSPostWhenIdle' value='1'/>
-  <enum name='NSPropertyListBinaryFormat_v1_0' value='200'/>
-  <enum name='NSPropertyListImmutable' value='0'/>
-  <enum name='NSPropertyListMutableContainers' value='1'/>
-  <enum name='NSPropertyListMutableContainersAndLeaves' value='2'/>
-  <enum name='NSPropertyListOpenStepFormat' value='1'/>
-  <enum name='NSPropertyListXMLFormat_v1_0' value='100'/>
-  <enum name='NSRandomSubelement' value='3'/>
-  <enum name='NSReceiverEvaluationScriptError' value='1'/>
-  <enum name='NSReceiversCantHandleCommandScriptError' value='4'/>
-  <enum name='NSRelativeAfter' value='0'/>
-  <enum name='NSRelativeBefore' value='1'/>
-  <enum name='NSRequiredArgumentsMissingScriptError' value='5'/>
-  <enum name='NSRoundBankers' value='3'/>
-  <enum name='NSRoundDown' value='1'/>
-  <enum name='NSRoundPlain' value='0'/>
-  <enum name='NSRoundUp' value='2'/>
-  <enum name='NSSaveOptionsAsk' value='2'/>
-  <enum name='NSSaveOptionsNo' value='1'/>
-  <enum name='NSSaveOptionsYes' value='0'/>
-  <enum name='NSScannedOption' value='1'/>
-  <enum name='NSSecondCalendarUnit' value='128'/>
-  <enum name='NSShiftJISStringEncoding' value='8'/>
-  <enum name='NSSolarisOperatingSystem' value='3'/>
-  <enum name='NSStreamEventEndEncountered' value='16'/>
-  <enum name='NSStreamEventErrorOccurred' value='8'/>
-  <enum name='NSStreamEventHasBytesAvailable' value='2'/>
-  <enum name='NSStreamEventHasSpaceAvailable' value='4'/>
-  <enum name='NSStreamEventNone' value='0'/>
-  <enum name='NSStreamEventOpenCompleted' value='1'/>
-  <enum name='NSStreamStatusAtEnd' value='5'/>
-  <enum name='NSStreamStatusClosed' value='6'/>
-  <enum name='NSStreamStatusError' value='7'/>
-  <enum name='NSStreamStatusNotOpen' value='0'/>
-  <enum name='NSStreamStatusOpen' value='2'/>
-  <enum name='NSStreamStatusOpening' value='1'/>
-  <enum name='NSStreamStatusReading' value='3'/>
-  <enum name='NSStreamStatusWriting' value='4'/>
-  <enum name='NSStringEncodingConversionAllowLossy' value='1'/>
-  <enum name='NSStringEncodingConversionExternalRepresentation' value='2'/>
-  <enum name='NSSubqueryExpressionType' value='13'/>
-  <enum name='NSSunOSOperatingSystem' value='6'/>
-  <enum name='NSSymbolStringEncoding' value='6'/>
-  <enum name='NSSystemDomainMask' value='8'/>
-  <enum name='NSTimeIntervalSince1970' value='978307200.00000000'/>
-  <enum name='NSTimeZoneNameStyleDaylightSaving' value='2'/>
-  <enum name='NSTimeZoneNameStyleShortDaylightSaving' value='3'/>
-  <enum name='NSTimeZoneNameStyleShortStandard' value='1'/>
-  <enum name='NSTimeZoneNameStyleStandard' value='0'/>
-  <enum name='NSUIntegerMax' value64='18446744073709551615' value='4294967295'/>
-  <enum name='NSURLCacheStorageAllowed' value='0'/>
-  <enum name='NSURLCacheStorageAllowedInMemoryOnly' value='1'/>
-  <enum name='NSURLCacheStorageNotAllowed' value='2'/>
-  <enum name='NSURLCredentialPersistenceForSession' value='1'/>
-  <enum name='NSURLCredentialPersistenceNone' value='0'/>
-  <enum name='NSURLCredentialPersistencePermanent' value='2'/>
-  <enum name='NSURLErrorBadServerResponse' value='-1011'/>
-  <enum name='NSURLErrorBadURL' value='-1000'/>
-  <enum name='NSURLErrorCancelled' value='-999'/>
-  <enum name='NSURLErrorCannotCloseFile' value='-3002'/>
-  <enum name='NSURLErrorCannotConnectToHost' value='-1004'/>
-  <enum name='NSURLErrorCannotCreateFile' value='-3000'/>
-  <enum name='NSURLErrorCannotDecodeContentData' value='-1016'/>
-  <enum name='NSURLErrorCannotDecodeRawData' value='-1015'/>
-  <enum name='NSURLErrorCannotFindHost' value='-1003'/>
-  <enum name='NSURLErrorCannotLoadFromNetwork' value='-2000'/>
-  <enum name='NSURLErrorCannotMoveFile' value='-3005'/>
-  <enum name='NSURLErrorCannotOpenFile' value='-3001'/>
-  <enum name='NSURLErrorCannotParseResponse' value='-1017'/>
-  <enum name='NSURLErrorCannotRemoveFile' value='-3004'/>
-  <enum name='NSURLErrorCannotWriteToFile' value='-3003'/>
-  <enum name='NSURLErrorClientCertificateRejected' value='-1205'/>
-  <enum name='NSURLErrorDNSLookupFailed' value='-1006'/>
-  <enum name='NSURLErrorDataLengthExceedsMaximum' value='-1103'/>
-  <enum name='NSURLErrorDownloadDecodingFailedMidStream' value='-3006'/>
-  <enum name='NSURLErrorDownloadDecodingFailedToComplete' value='-3007'/>
-  <enum name='NSURLErrorFileDoesNotExist' value='-1100'/>
-  <enum name='NSURLErrorFileIsDirectory' value='-1101'/>
-  <enum name='NSURLErrorHTTPTooManyRedirects' value='-1007'/>
-  <enum name='NSURLErrorNetworkConnectionLost' value='-1005'/>
-  <enum name='NSURLErrorNoPermissionsToReadFile' value='-1102'/>
-  <enum name='NSURLErrorNotConnectedToInternet' value='-1009'/>
-  <enum name='NSURLErrorRedirectToNonExistentLocation' value='-1010'/>
-  <enum name='NSURLErrorResourceUnavailable' value='-1008'/>
-  <enum name='NSURLErrorSecureConnectionFailed' value='-1200'/>
-  <enum name='NSURLErrorServerCertificateHasBadDate' value='-1201'/>
-  <enum name='NSURLErrorServerCertificateHasUnknownRoot' value='-1203'/>
-  <enum name='NSURLErrorServerCertificateNotYetValid' value='-1204'/>
-  <enum name='NSURLErrorServerCertificateUntrusted' value='-1202'/>
-  <enum name='NSURLErrorTimedOut' value='-1001'/>
-  <enum name='NSURLErrorUnknown' value='-1'/>
-  <enum name='NSURLErrorUnsupportedURL' value='-1002'/>
-  <enum name='NSURLErrorUserAuthenticationRequired' value='-1013'/>
-  <enum name='NSURLErrorUserCancelledAuthentication' value='-1012'/>
-  <enum name='NSURLErrorZeroByteResource' value='-1014'/>
-  <enum name='NSURLHandleLoadFailed' value='3'/>
-  <enum name='NSURLHandleLoadInProgress' value='2'/>
-  <enum name='NSURLHandleLoadSucceeded' value='1'/>
-  <enum name='NSURLHandleNotLoaded' value='0'/>
-  <enum name='NSURLRequestReloadIgnoringCacheData' value='1'/>
-  <enum name='NSURLRequestReloadIgnoringLocalAndRemoteCacheData' value='4'/>
-  <enum name='NSURLRequestReloadIgnoringLocalCacheData' value='1'/>
-  <enum name='NSURLRequestReloadRevalidatingCacheData' value='5'/>
-  <enum name='NSURLRequestReturnCacheDataDontLoad' value='3'/>
-  <enum name='NSURLRequestReturnCacheDataElseLoad' value='2'/>
-  <enum name='NSURLRequestUseProtocolCachePolicy' value='0'/>
-  <enum name='NSUTF16BigEndianStringEncoding' value='-1879047936'/>
-  <enum name='NSUTF16LittleEndianStringEncoding' value='-1811939072'/>
-  <enum name='NSUTF16StringEncoding' value='10'/>
-  <enum name='NSUTF32BigEndianStringEncoding' value='-1744830208'/>
-  <enum name='NSUTF32LittleEndianStringEncoding' value='-1677721344'/>
-  <enum name='NSUTF32StringEncoding' value='-1946156800'/>
-  <enum name='NSUTF8StringEncoding' value='4'/>
-  <enum name='NSUncachedRead' value='2'/>
-  <enum name='NSUndefinedDateComponent' value64='-1' value='2147483647'/>
-  <enum name='NSUndoCloseGroupingRunLoopOrdering' value='350000'/>
-  <enum name='NSUnicodeStringEncoding' value='10'/>
-  <enum name='NSUnionSetExpressionType' value='5'/>
-  <enum name='NSUnknownKeyScriptError' value='7'/>
-  <enum name='NSUnknownKeySpecifierError' value='3'/>
-  <enum name='NSUserCancelledError' value='3072'/>
-  <enum name='NSUserDirectory' value='7'/>
-  <enum name='NSUserDomainMask' value='1'/>
-  <enum name='NSValidationErrorMaximum' value='2047'/>
-  <enum name='NSValidationErrorMinimum' value='1024'/>
-  <enum name='NSVariableExpressionType' value='2'/>
-  <enum name='NSWeekCalendarUnit' value='256'/>
-  <enum name='NSWeekdayCalendarUnit' value='512'/>
-  <enum name='NSWeekdayOrdinalCalendarUnit' value='1024'/>
-  <enum name='NSWidthInsensitiveSearch' value='256'/>
-  <enum name='NSWindows95OperatingSystem' value='2'/>
-  <enum name='NSWindowsCP1250StringEncoding' value='15'/>
-  <enum name='NSWindowsCP1251StringEncoding' value='11'/>
-  <enum name='NSWindowsCP1252StringEncoding' value='12'/>
-  <enum name='NSWindowsCP1253StringEncoding' value='13'/>
-  <enum name='NSWindowsCP1254StringEncoding' value='14'/>
-  <enum name='NSWindowsNTOperatingSystem' value='1'/>
-  <enum name='NSWrapCalendarComponents' value='1'/>
-  <enum name='NSXMLAttributeCDATAKind' value='6'/>
-  <enum name='NSXMLAttributeDeclarationKind' value='10'/>
-  <enum name='NSXMLAttributeEntitiesKind' value='11'/>
-  <enum name='NSXMLAttributeEntityKind' value='10'/>
-  <enum name='NSXMLAttributeEnumerationKind' value='14'/>
-  <enum name='NSXMLAttributeIDKind' value='7'/>
-  <enum name='NSXMLAttributeIDRefKind' value='8'/>
-  <enum name='NSXMLAttributeIDRefsKind' value='9'/>
-  <enum name='NSXMLAttributeKind' value='3'/>
-  <enum name='NSXMLAttributeNMTokenKind' value='12'/>
-  <enum name='NSXMLAttributeNMTokensKind' value='13'/>
-  <enum name='NSXMLAttributeNotationKind' value='15'/>
-  <enum name='NSXMLCommentKind' value='6'/>
-  <enum name='NSXMLDTDKind' value='8'/>
-  <enum name='NSXMLDocumentHTMLKind' value='2'/>
-  <enum name='NSXMLDocumentIncludeContentTypeDeclaration' value='262144'/>
-  <enum name='NSXMLDocumentKind' value='1'/>
-  <enum name='NSXMLDocumentTextKind' value='3'/>
-  <enum name='NSXMLDocumentTidyHTML' value='512'/>
-  <enum name='NSXMLDocumentTidyXML' value='1024'/>
-  <enum name='NSXMLDocumentValidate' value='8192'/>
-  <enum name='NSXMLDocumentXHTMLKind' value='1'/>
-  <enum name='NSXMLDocumentXInclude' value='65536'/>
-  <enum name='NSXMLDocumentXMLKind' value='0'/>
-  <enum name='NSXMLElementDeclarationAnyKind' value='18'/>
-  <enum name='NSXMLElementDeclarationElementKind' value='20'/>
-  <enum name='NSXMLElementDeclarationEmptyKind' value='17'/>
-  <enum name='NSXMLElementDeclarationKind' value='11'/>
-  <enum name='NSXMLElementDeclarationMixedKind' value='19'/>
-  <enum name='NSXMLElementDeclarationUndefinedKind' value='16'/>
-  <enum name='NSXMLElementKind' value='2'/>
-  <enum name='NSXMLEntityDeclarationKind' value='9'/>
-  <enum name='NSXMLEntityGeneralKind' value='1'/>
-  <enum name='NSXMLEntityParameterKind' value='4'/>
-  <enum name='NSXMLEntityParsedKind' value='2'/>
-  <enum name='NSXMLEntityPredefined' value='5'/>
-  <enum name='NSXMLEntityUnparsedKind' value='3'/>
-  <enum name='NSXMLInvalidKind' value='0'/>
-  <enum name='NSXMLNamespaceKind' value='4'/>
-  <enum name='NSXMLNodeCompactEmptyElement' value='4'/>
-  <enum name='NSXMLNodeExpandEmptyElement' value='2'/>
-  <enum name='NSXMLNodeIsCDATA' value='1'/>
-  <enum name='NSXMLNodeOptionsNone' value='0'/>
-  <enum name='NSXMLNodePreserveAll' value='-1048546'/>
-  <enum name='NSXMLNodePreserveAttributeOrder' value='2097152'/>
-  <enum name='NSXMLNodePreserveCDATA' value='16777216'/>
-  <enum name='NSXMLNodePreserveCharacterReferences' value='134217728'/>
-  <enum name='NSXMLNodePreserveDTD' value='67108864'/>
-  <enum name='NSXMLNodePreserveEmptyElements' value='6'/>
-  <enum name='NSXMLNodePreserveEntities' value='4194304'/>
-  <enum name='NSXMLNodePreserveNamespaceOrder' value='1048576'/>
-  <enum name='NSXMLNodePreservePrefixes' value='8388608'/>
-  <enum name='NSXMLNodePreserveQuotes' value='24'/>
-  <enum name='NSXMLNodePreserveWhitespace' value='33554432'/>
-  <enum name='NSXMLNodePrettyPrint' value='131072'/>
-  <enum name='NSXMLNodeUseDoubleQuotes' value='16'/>
-  <enum name='NSXMLNodeUseSingleQuotes' value='8'/>
-  <enum name='NSXMLNotationDeclarationKind' value='12'/>
-  <enum name='NSXMLParserAttributeHasNoValueError' value='41'/>
-  <enum name='NSXMLParserAttributeListNotFinishedError' value='51'/>
-  <enum name='NSXMLParserAttributeListNotStartedError' value='50'/>
-  <enum name='NSXMLParserAttributeNotFinishedError' value='40'/>
-  <enum name='NSXMLParserAttributeNotStartedError' value='39'/>
-  <enum name='NSXMLParserAttributeRedefinedError' value='42'/>
-  <enum name='NSXMLParserCDATANotFinishedError' value='63'/>
-  <enum name='NSXMLParserCharacterRefAtEOFError' value='10'/>
-  <enum name='NSXMLParserCharacterRefInDTDError' value='13'/>
-  <enum name='NSXMLParserCharacterRefInEpilogError' value='12'/>
-  <enum name='NSXMLParserCharacterRefInPrologError' value='11'/>
-  <enum name='NSXMLParserCommentContainsDoubleHyphenError' value='80'/>
-  <enum name='NSXMLParserCommentNotFinishedError' value='45'/>
-  <enum name='NSXMLParserConditionalSectionNotFinishedError' value='59'/>
-  <enum name='NSXMLParserConditionalSectionNotStartedError' value='58'/>
-  <enum name='NSXMLParserDOCTYPEDeclNotFinishedError' value='61'/>
-  <enum name='NSXMLParserDelegateAbortedParseError' value='512'/>
-  <enum name='NSXMLParserDocumentStartError' value='3'/>
-  <enum name='NSXMLParserElementContentDeclNotFinishedError' value='55'/>
-  <enum name='NSXMLParserElementContentDeclNotStartedError' value='54'/>
-  <enum name='NSXMLParserEmptyDocumentError' value='4'/>
-  <enum name='NSXMLParserEncodingNotSupportedError' value='32'/>
-  <enum name='NSXMLParserEntityBoundaryError' value='90'/>
-  <enum name='NSXMLParserEntityIsExternalError' value='29'/>
-  <enum name='NSXMLParserEntityIsParameterError' value='30'/>
-  <enum name='NSXMLParserEntityNotFinishedError' value='37'/>
-  <enum name='NSXMLParserEntityNotStartedError' value='36'/>
-  <enum name='NSXMLParserEntityRefAtEOFError' value='14'/>
-  <enum name='NSXMLParserEntityRefInDTDError' value='17'/>
-  <enum name='NSXMLParserEntityRefInEpilogError' value='16'/>
-  <enum name='NSXMLParserEntityRefInPrologError' value='15'/>
-  <enum name='NSXMLParserEntityRefLoopError' value='89'/>
-  <enum name='NSXMLParserEntityReferenceMissingSemiError' value='23'/>
-  <enum name='NSXMLParserEntityReferenceWithoutNameError' value='22'/>
-  <enum name='NSXMLParserEntityValueRequiredError' value='84'/>
-  <enum name='NSXMLParserEqualExpectedError' value='75'/>
-  <enum name='NSXMLParserExternalStandaloneEntityError' value='82'/>
-  <enum name='NSXMLParserExternalSubsetNotFinishedError' value='60'/>
-  <enum name='NSXMLParserExtraContentError' value='86'/>
-  <enum name='NSXMLParserGTRequiredError' value='73'/>
-  <enum name='NSXMLParserInternalError' value='1'/>
-  <enum name='NSXMLParserInvalidCharacterError' value='9'/>
-  <enum name='NSXMLParserInvalidCharacterInEntityError' value='87'/>
-  <enum name='NSXMLParserInvalidCharacterRefError' value='8'/>
-  <enum name='NSXMLParserInvalidConditionalSectionError' value='83'/>
-  <enum name='NSXMLParserInvalidDecimalCharacterRefError' value='7'/>
-  <enum name='NSXMLParserInvalidEncodingError' value='81'/>
-  <enum name='NSXMLParserInvalidEncodingNameError' value='79'/>
-  <enum name='NSXMLParserInvalidHexCharacterRefError' value='6'/>
-  <enum name='NSXMLParserInvalidURIError' value='91'/>
-  <enum name='NSXMLParserLTRequiredError' value='72'/>
-  <enum name='NSXMLParserLTSlashRequiredError' value='74'/>
-  <enum name='NSXMLParserLessThanSymbolInAttributeError' value='38'/>
-  <enum name='NSXMLParserLiteralNotFinishedError' value='44'/>
-  <enum name='NSXMLParserLiteralNotStartedError' value='43'/>
-  <enum name='NSXMLParserMisplacedCDATAEndStringError' value='62'/>
-  <enum name='NSXMLParserMisplacedXMLDeclarationError' value='64'/>
-  <enum name='NSXMLParserMixedContentDeclNotFinishedError' value='53'/>
-  <enum name='NSXMLParserMixedContentDeclNotStartedError' value='52'/>
-  <enum name='NSXMLParserNAMERequiredError' value='68'/>
-  <enum name='NSXMLParserNMTOKENRequiredError' value='67'/>
-  <enum name='NSXMLParserNamespaceDeclarationError' value='35'/>
-  <enum name='NSXMLParserNoDTDError' value='94'/>
-  <enum name='NSXMLParserNotWellBalancedError' value='85'/>
-  <enum name='NSXMLParserNotationNotFinishedError' value='49'/>
-  <enum name='NSXMLParserNotationNotStartedError' value='48'/>
-  <enum name='NSXMLParserOutOfMemoryError' value='2'/>
-  <enum name='NSXMLParserPCDATARequiredError' value='69'/>
-  <enum name='NSXMLParserParsedEntityRefAtEOFError' value='18'/>
-  <enum name='NSXMLParserParsedEntityRefInEpilogError' value='20'/>
-  <enum name='NSXMLParserParsedEntityRefInInternalError' value='88'/>
-  <enum name='NSXMLParserParsedEntityRefInInternalSubsetError' value='21'/>
-  <enum name='NSXMLParserParsedEntityRefInPrologError' value='19'/>
-  <enum name='NSXMLParserParsedEntityRefMissingSemiError' value='25'/>
-  <enum name='NSXMLParserParsedEntityRefNoNameError' value='24'/>
-  <enum name='NSXMLParserPrematureDocumentEndError' value='5'/>
-  <enum name='NSXMLParserProcessingInstructionNotFinishedError' value='47'/>
-  <enum name='NSXMLParserProcessingInstructionNotStartedError' value='46'/>
-  <enum name='NSXMLParserPublicIdentifierRequiredError' value='71'/>
-  <enum name='NSXMLParserSeparatorRequiredError' value='66'/>
-  <enum name='NSXMLParserSpaceRequiredError' value='65'/>
-  <enum name='NSXMLParserStandaloneValueError' value='78'/>
-  <enum name='NSXMLParserStringNotClosedError' value='34'/>
-  <enum name='NSXMLParserStringNotStartedError' value='33'/>
-  <enum name='NSXMLParserTagNameMismatchError' value='76'/>
-  <enum name='NSXMLParserURIFragmentError' value='92'/>
-  <enum name='NSXMLParserURIRequiredError' value='70'/>
-  <enum name='NSXMLParserUndeclaredEntityError' value='26'/>
-  <enum name='NSXMLParserUnfinishedTagError' value='77'/>
-  <enum name='NSXMLParserUnknownEncodingError' value='31'/>
-  <enum name='NSXMLParserUnparsedEntityError' value='28'/>
-  <enum name='NSXMLParserXMLDeclNotFinishedError' value='57'/>
-  <enum name='NSXMLParserXMLDeclNotStartedError' value='56'/>
-  <enum name='NSXMLProcessingInstructionKind' value='5'/>
-  <enum name='NSXMLTextKind' value='7'/>
-  <enum name='NSYearCalendarUnit' value='4'/>
-  <enum name='NS_BigEndian' value='2'/>
-  <enum name='NS_LittleEndian' value='1'/>
-  <enum name='NS_UNICHAR_IS_EIGHT_BIT' value='0'/>
-  <enum name='NS_UnknownByteOrder' value='0'/>
-  <function name='NSAllHashTableObjects'>
-    <arg name='table' declared_type='NSHashTable*' type='@'/>
-    <retval declared_type='NSArray*' type='@'/>
-  </function>
-  <function name='NSAllMapTableKeys'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-    <retval declared_type='NSArray*' type='@'/>
-  </function>
-  <function name='NSAllMapTableValues'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-    <retval declared_type='NSArray*' type='@'/>
-  </function>
-  <function name='NSAllocateCollectable'>
-    <arg name='size' declared_type='NSUInteger' type='I' type64='Q'/>
-    <arg name='options' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NSAllocateMemoryPages'>
-    <arg name='bytes' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NSAllocateObject'>
-    <arg name='aClass' declared_type='Class' type='#'/>
-    <arg name='extraBytes' declared_type='NSUInteger' type='I' type64='Q'/>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <retval declared_type='id' type='@'/>
-  </function>
-  <function name='NSClassFromString'>
-    <arg name='aClassName' declared_type='NSString*' type='@'/>
-    <retval declared_type='Class' type='#'/>
-  </function>
-  <function name='NSCompareHashTables'>
-    <arg name='table1' declared_type='NSHashTable*' type='@'/>
-    <arg name='table2' declared_type='NSHashTable*' type='@'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSCompareMapTables'>
-    <arg name='table1' declared_type='NSMapTable*' type='@'/>
-    <arg name='table2' declared_type='NSMapTable*' type='@'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSContainsRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='bRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSConvertHostDoubleToSwapped' inline='true'>
-    <arg name='x' declared_type='double' type='d'/>
-    <retval declared_type='NSSwappedDouble' type='{_NSSwappedDouble=Q}'/>
-  </function>
-  <function name='NSConvertHostFloatToSwapped' inline='true'>
-    <arg name='x' declared_type='float' type='f'/>
-    <retval declared_type='NSSwappedFloat' type='{_NSSwappedFloat=I}'/>
-  </function>
-  <function name='NSConvertSwappedDoubleToHost' inline='true'>
-    <arg name='x' declared_type='NSSwappedDouble' type='{_NSSwappedDouble=Q}'/>
-    <retval declared_type='double' type='d'/>
-  </function>
-  <function name='NSConvertSwappedFloatToHost' inline='true'>
-    <arg name='x' declared_type='NSSwappedFloat' type='{_NSSwappedFloat=I}'/>
-    <retval declared_type='float' type='f'/>
-  </function>
-  <function name='NSCopyHashTableWithZone'>
-    <arg name='table' declared_type='NSHashTable*' type='@'/>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <retval declared_type='NSHashTable*' type='@'/>
-  </function>
-  <function name='NSCopyMapTableWithZone'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <retval declared_type='NSMapTable*' type='@'/>
-  </function>
-  <function name='NSCopyMemoryPages'>
-    <arg name='source' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-    <arg name='dest' declared_type='void*' type='^v' type_modifier='n'/>
-    <arg name='bytes' declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSCopyObject'>
-    <arg name='object' declared_type='id' type='@'/>
-    <arg name='extraBytes' declared_type='NSUInteger' type='I' type64='Q'/>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <retval declared_type='id' type='@'/>
-  </function>
-  <function name='NSCountFrames'>
-    <retval declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSCountHashTable'>
-    <arg name='table' declared_type='NSHashTable*' type='@'/>
-    <retval declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSCountMapTable'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-    <retval declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSCreateHashTable'>
-    <arg name='callBacks' declared_type='NSHashTableCallBacks' type='{_NSHashTableCallBacks=^?^?^?^?^?}'/>
-    <arg name='capacity' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='NSHashTable*' type='@'/>
-  </function>
-  <function name='NSCreateHashTableWithZone'>
-    <arg name='callBacks' declared_type='NSHashTableCallBacks' type='{_NSHashTableCallBacks=^?^?^?^?^?}'/>
-    <arg name='capacity' declared_type='NSUInteger' type='I' type64='Q'/>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <retval declared_type='NSHashTable*' type='@'/>
-  </function>
-  <function name='NSCreateMapTable'>
-    <arg name='keyCallBacks' declared_type='NSMapTableKeyCallBacks' type='{_NSMapTableKeyCallBacks=^?^?^?^?^?^v}'/>
-    <arg name='valueCallBacks' declared_type='NSMapTableValueCallBacks' type='{_NSMapTableValueCallBacks=^?^?^?}'/>
-    <arg name='capacity' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='NSMapTable*' type='@'/>
-  </function>
-  <function name='NSCreateMapTableWithZone'>
-    <arg name='keyCallBacks' declared_type='NSMapTableKeyCallBacks' type='{_NSMapTableKeyCallBacks=^?^?^?^?^?^v}'/>
-    <arg name='valueCallBacks' declared_type='NSMapTableValueCallBacks' type='{_NSMapTableValueCallBacks=^?^?^?}'/>
-    <arg name='capacity' declared_type='NSUInteger' type='I' type64='Q'/>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <retval declared_type='NSMapTable*' type='@'/>
-  </function>
-  <function name='NSCreateZone'>
-    <arg name='startSize' declared_type='NSUInteger' type='I' type64='Q'/>
-    <arg name='granularity' declared_type='NSUInteger' type='I' type64='Q'/>
-    <arg name='canFree' declared_type='BOOL' type='B'/>
-    <retval declared_type='NSZone*' type='^{_NSZone=}'/>
-  </function>
-  <function name='NSDeallocateMemoryPages'>
-    <arg name='ptr' declared_type='void*' type='^v' type_modifier='n'/>
-    <arg name='bytes' declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSDeallocateObject'>
-    <arg name='object' declared_type='id' type='@'/>
-  </function>
-  <function name='NSDecimalAdd'>
-    <arg name='result' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' type_modifier='n'/>
-    <arg name='leftOperand' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='rightOperand' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='roundingMode' declared_type='NSRoundingMode' type='I' type64='Q'/>
-    <retval declared_type='NSCalculationError' type='I' type64='Q'/>
-  </function>
-  <function name='NSDecimalCompact'>
-    <arg name='number' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' type_modifier='n'/>
-  </function>
-  <function name='NSDecimalCompare'>
-    <arg name='leftOperand' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='rightOperand' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-  </function>
-  <function name='NSDecimalCopy'>
-    <arg name='destination' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' type_modifier='n'/>
-    <arg name='source' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-  </function>
-  <function name='NSDecimalDivide'>
-    <arg name='result' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' type_modifier='n'/>
-    <arg name='leftOperand' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='rightOperand' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='roundingMode' declared_type='NSRoundingMode' type='I' type64='Q'/>
-    <retval declared_type='NSCalculationError' type='I' type64='Q'/>
-  </function>
-  <function name='NSDecimalIsNotANumber' inline='true'>
-    <arg name='dcm' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSDecimalMultiply'>
-    <arg name='result' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' type_modifier='n'/>
-    <arg name='leftOperand' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='rightOperand' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='roundingMode' declared_type='NSRoundingMode' type='I' type64='Q'/>
-    <retval declared_type='NSCalculationError' type='I' type64='Q'/>
-  </function>
-  <function name='NSDecimalMultiplyByPowerOf10'>
-    <arg name='result' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' type_modifier='n'/>
-    <arg name='number' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='power' declared_type='short' type='s'/>
-    <arg name='roundingMode' declared_type='NSRoundingMode' type='I' type64='Q'/>
-    <retval declared_type='NSCalculationError' type='I' type64='Q'/>
-  </function>
-  <function name='NSDecimalNormalize'>
-    <arg name='number1' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' type_modifier='n'/>
-    <arg name='number2' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' type_modifier='n'/>
-    <arg name='roundingMode' declared_type='NSRoundingMode' type='I' type64='Q'/>
-    <retval declared_type='NSCalculationError' type='I' type64='Q'/>
-  </function>
-  <function name='NSDecimalPower'>
-    <arg name='result' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' type_modifier='n'/>
-    <arg name='number' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='power' declared_type='NSUInteger' type='I' type64='Q'/>
-    <arg name='roundingMode' declared_type='NSRoundingMode' type='I' type64='Q'/>
-    <retval declared_type='NSCalculationError' type='I' type64='Q'/>
-  </function>
-  <function name='NSDecimalRound'>
-    <arg name='result' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' type_modifier='n'/>
-    <arg name='number' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='scale' declared_type='NSInteger' type='i' type64='q'/>
-    <arg name='roundingMode' declared_type='NSRoundingMode' type='I' type64='Q'/>
-  </function>
-  <function name='NSDecimalString'>
-    <arg name='dcm' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='locale' declared_type='id' type='@'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSDecimalSubtract'>
-    <arg name='result' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' type_modifier='n'/>
-    <arg name='leftOperand' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='rightOperand' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' const='true' type_modifier='n'/>
-    <arg name='roundingMode' declared_type='NSRoundingMode' type='I' type64='Q'/>
-    <retval declared_type='NSCalculationError' type='I' type64='Q'/>
-  </function>
-  <function name='NSDecrementExtraRefCountWasZero'>
-    <arg name='object' declared_type='id' type='@'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSDefaultMallocZone'>
-    <retval declared_type='NSZone*' type='^{_NSZone=}'/>
-  </function>
-  <function name='NSDivideRect'>
-    <arg name='inRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='slice' declared_type='NSRect*' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='o'/>
-    <arg name='rem' declared_type='NSRect*' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='o'/>
-    <arg name='amount' declared_type='CGFloat' type='f' type64='d'/>
-    <arg name='edge' declared_type='NSRectEdge' type='i' type64='Q'/>
-  </function>
-  <function name='NSEndHashTableEnumeration'>
-    <arg name='enumerator' declared_type='NSHashEnumerator*' type='^{_NSMapEnumerator=II^v}' type64='^{_NSMapEnumerator=QQ^v}' type_modifier='n'/>
-  </function>
-  <function name='NSEndMapTableEnumeration'>
-    <arg name='enumerator' declared_type='NSMapEnumerator*' type='^{_NSMapEnumerator=II^v}' type64='^{_NSMapEnumerator=QQ^v}' type_modifier='n'/>
-  </function>
-  <function name='NSEnumerateHashTable'>
-    <arg name='table' declared_type='NSHashTable*' type='@'/>
-    <retval declared_type='NSHashEnumerator' type='{_NSMapEnumerator=II^v}' type64='{_NSMapEnumerator=QQ^v}'/>
-  </function>
-  <function name='NSEnumerateMapTable'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-    <retval declared_type='NSMapEnumerator' type='{_NSMapEnumerator=II^v}' type64='{_NSMapEnumerator=QQ^v}'/>
-  </function>
-  <function name='NSEqualPoints'>
-    <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    <arg name='bPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSEqualRanges' inline='true'>
-    <arg name='range1' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    <arg name='range2' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSEqualRects'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='bRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSEqualSizes'>
-    <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    <arg name='bSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSExtraRefCount'>
-    <arg name='object' declared_type='id' type='@'/>
-    <retval declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSFileTypeForHFSTypeCode'>
-    <arg name='hfsFileTypeCode' declared_type='OSType' type='L' type64='I'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSFrameAddress'>
-    <arg name='frame' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NSFreeHashTable'>
-    <arg name='table' declared_type='NSHashTable*' type='@'/>
-  </function>
-  <function name='NSFreeMapTable'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-  </function>
-  <function name='NSFullUserName'>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSGetSizeAndAlignment'>
-    <arg name='typePtr' declared_type='char*' type='*' const='true' type_modifier='o'/>
-    <arg name='sizep' declared_type='NSUInteger*' type='^I' type64='^Q' type_modifier='o'/>
-    <arg name='alignp' declared_type='NSUInteger*' type='^I' type64='^Q' type_modifier='o'/>
-    <retval declared_type='char*' type='*' const='true'/>
-  </function>
-  <function name='NSGetUncaughtExceptionHandler'>
-    <retval function_pointer='true' declared_type='NSUncaughtExceptionHandler*' type='^?'>
-      <arg declared_type='NSException*' type='@'/>
-      <retval declared_type='void' type='v'/>
-    </retval>
-  </function>
-  <function name='NSHFSTypeCodeFromFileType'>
-    <arg name='fileTypeString' declared_type='NSString*' type='@'/>
-    <retval declared_type='OSType' type='L' type64='I'/>
-  </function>
-  <function name='NSHFSTypeOfFile'>
-    <arg name='fullFilePath' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSHashGet'>
-    <arg name='table' declared_type='NSHashTable*' type='@'/>
-    <arg name='pointer' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NSHashInsert'>
-    <arg name='table' declared_type='NSHashTable*' type='@'/>
-    <arg name='pointer' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-  </function>
-  <function name='NSHashInsertIfAbsent'>
-    <arg name='table' declared_type='NSHashTable*' type='@'/>
-    <arg name='pointer' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NSHashInsertKnownAbsent'>
-    <arg name='table' declared_type='NSHashTable*' type='@'/>
-    <arg name='pointer' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-  </function>
-  <function name='NSHashRemove'>
-    <arg name='table' declared_type='NSHashTable*' type='@'/>
-    <arg name='pointer' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-  </function>
-  <function name='NSHeight' inline='true'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='CGFloat' type='f' type64='d'/>
-  </function>
-  <function name='NSHomeDirectory'>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSHomeDirectoryForUser'>
-    <arg name='userName' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSHostByteOrder' inline='true'>
-    <retval declared_type='long' type='l' type64='q'/>
-  </function>
-  <function name='NSIncrementExtraRefCount'>
-    <arg name='object' declared_type='id' type='@'/>
-  </function>
-  <function name='NSInsetRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='dX' declared_type='CGFloat' type='f' type64='d'/>
-    <arg name='dY' declared_type='CGFloat' type='f' type64='d'/>
-    <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSIntegralRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSIntersectionRange'>
-    <arg name='range1' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    <arg name='range2' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-  </function>
-  <function name='NSIntersectionRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='bRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSIntersectsRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='bRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSIsEmptyRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSIsFreedObject'>
-    <arg name='anObject' declared_type='id' type='@'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSLocationInRange' inline='true'>
-    <arg name='loc' declared_type='NSUInteger' type='I' type64='Q'/>
-    <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSLog' variadic='true'>
-    <arg printf_format='true' name='format' declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSLogPageSize'>
-    <retval declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSLogv'>
-    <arg name='format' declared_type='NSString*' type='@'/>
-    <arg name='args' declared_type='va_list' type='*' type64='[1{?=II^v^v}]'/>
-  </function>
-  <function name='NSMakeCollectable' inline='true'>
-    <arg name='cf' declared_type='CFTypeRef' type='@'/>
-    <retval declared_type='id' type='@'/>
-  </function>
-  <function name='NSMakePoint' inline='true'>
-    <arg name='x' declared_type='CGFloat' type='f' type64='d'/>
-    <arg name='y' declared_type='CGFloat' type='f' type64='d'/>
-    <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-  </function>
-  <function name='NSMakeRange' inline='true'>
-    <arg name='loc' declared_type='NSUInteger' type='I' type64='Q'/>
-    <arg name='len' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-  </function>
-  <function name='NSMakeRect' inline='true'>
-    <arg name='x' declared_type='CGFloat' type='f' type64='d'/>
-    <arg name='y' declared_type='CGFloat' type='f' type64='d'/>
-    <arg name='w' declared_type='CGFloat' type='f' type64='d'/>
-    <arg name='h' declared_type='CGFloat' type='f' type64='d'/>
-    <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSMakeSize' inline='true'>
-    <arg name='w' declared_type='CGFloat' type='f' type64='d'/>
-    <arg name='h' declared_type='CGFloat' type='f' type64='d'/>
-    <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-  </function>
-  <function name='NSMapGet'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-    <arg name='key' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NSMapInsert'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-    <arg name='key' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-    <arg name='value' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-  </function>
-  <function name='NSMapInsertIfAbsent'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-    <arg name='key' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-    <arg name='value' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NSMapInsertKnownAbsent'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-    <arg name='key' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-    <arg name='value' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-  </function>
-  <function name='NSMapMember'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-    <arg name='key' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-    <arg name='originalKey' declared_type='void**' type='^^v' type_modifier='o'/>
-    <arg name='value' declared_type='void**' type='^^v' type_modifier='o'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSMapRemove'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-    <arg name='key' declared_type='void*' type='^v' const='true' type_modifier='n'/>
-  </function>
-  <function name='NSMaxRange' inline='true'>
-    <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    <retval declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSMaxX' inline='true'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='CGFloat' type='f' type64='d'/>
-  </function>
-  <function name='NSMaxY' inline='true'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='CGFloat' type='f' type64='d'/>
-  </function>
-  <function name='NSMidX' inline='true'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='CGFloat' type='f' type64='d'/>
-  </function>
-  <function name='NSMidY' inline='true'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='CGFloat' type='f' type64='d'/>
-  </function>
-  <function name='NSMinX' inline='true'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='CGFloat' type='f' type64='d'/>
-  </function>
-  <function name='NSMinY' inline='true'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='CGFloat' type='f' type64='d'/>
-  </function>
-  <function name='NSMouseInRect'>
-    <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='flipped' declared_type='BOOL' type='B'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSNextHashEnumeratorItem'>
-    <arg name='enumerator' declared_type='NSHashEnumerator*' type='^{_NSMapEnumerator=II^v}' type64='^{_NSMapEnumerator=QQ^v}' type_modifier='n'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NSNextMapEnumeratorPair'>
-    <arg name='enumerator' declared_type='NSMapEnumerator*' type='^{_NSMapEnumerator=II^v}' type64='^{_NSMapEnumerator=QQ^v}' type_modifier='n'/>
-    <arg name='key' declared_type='void**' type='^^v' type_modifier='o'/>
-    <arg name='value' declared_type='void**' type='^^v' type_modifier='o'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSOffsetRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='dX' declared_type='CGFloat' type='f' type64='d'/>
-    <arg name='dY' declared_type='CGFloat' type='f' type64='d'/>
-    <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSOpenStepRootDirectory'>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSPageSize'>
-    <retval declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSPointFromCGPoint' inline='true'>
-    <arg name='cgpoint' declared_type='CGPoint' type='{CGPoint=ff}' type64='{CGPoint=dd}'/>
-    <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-  </function>
-  <function name='NSPointFromString'>
-    <arg name='aString' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-  </function>
-  <function name='NSPointInRect'>
-    <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSPointToCGPoint' inline='true'>
-    <arg name='nspoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    <retval declared_type='CGPoint' type='{CGPoint=ff}' type64='{CGPoint=dd}'/>
-  </function>
-  <function name='NSProtocolFromString'>
-    <arg name='namestr' declared_type='NSString*' type='@'/>
-    <retval declared_type='Protocol*' type='@'/>
-  </function>
-  <function name='NSRangeFromString'>
-    <arg name='aString' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-  </function>
-  <function name='NSRealMemoryAvailable'>
-    <retval declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSReallocateCollectable'>
-    <arg name='ptr' declared_type='void*' type='^v' type_modifier='n'/>
-    <arg name='size' declared_type='NSUInteger' type='I' type64='Q'/>
-    <arg name='options' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NSRecordAllocationEvent'>
-    <arg name='eventType' declared_type='int' type='i'/>
-    <arg name='object' declared_type='id' type='@'/>
-  </function>
-  <function name='NSRectFromCGRect' inline='true'>
-    <arg name='cgrect' declared_type='CGRect' type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSRectFromString'>
-    <arg name='aString' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSRectToCGRect' inline='true'>
-    <arg name='nsrect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='CGRect' type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSRecycleZone'>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-  </function>
-  <function name='NSResetHashTable'>
-    <arg name='table' declared_type='NSHashTable*' type='@'/>
-  </function>
-  <function name='NSResetMapTable'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-  </function>
-  <function name='NSReturnAddress'>
-    <arg name='frame' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NSRoundDownToMultipleOfPageSize'>
-    <arg name='bytes' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSRoundUpToMultipleOfPageSize'>
-    <arg name='bytes' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='NSUInteger' type='I' type64='Q'/>
-  </function>
-  <function name='NSSearchPathForDirectoriesInDomains'>
-    <arg name='directory' declared_type='NSSearchPathDirectory' type='I' type64='Q'/>
-    <arg name='domainMask' declared_type='NSSearchPathDomainMask' type='I' type64='Q'/>
-    <arg name='expandTilde' declared_type='BOOL' type='B'/>
-    <retval declared_type='NSArray*' type='@'/>
-  </function>
-  <function name='NSSelectorFromString'>
-    <arg name='aSelectorName' declared_type='NSString*' type='@'/>
-    <retval declared_type='SEL' type=':'/>
-  </function>
-  <function name='NSSetUncaughtExceptionHandler'>
-    <arg name='dummy' function_pointer='true' declared_type='NSUncaughtExceptionHandler*' type='^?' type_modifier='n'>
-      <arg declared_type='NSException*' type='@'/>
-      <retval declared_type='void' type='v'/>
-    </arg>
-  </function>
-  <function name='NSSetZoneName'>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <arg name='name' declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSShouldRetainWithZone'>
-    <arg name='anObject' declared_type='id' type='@'/>
-    <arg name='requestedZone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <retval declared_type='BOOL' type='B'/>
-  </function>
-  <function name='NSSizeFromCGSize' inline='true'>
-    <arg name='cgsize' declared_type='CGSize' type='{CGSize=ff}' type64='{CGSize=dd}'/>
-    <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-  </function>
-  <function name='NSSizeFromString'>
-    <arg name='aString' declared_type='NSString*' type='@'/>
-    <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-  </function>
-  <function name='NSSizeToCGSize' inline='true'>
-    <arg name='nssize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    <retval declared_type='CGSize' type='{CGSize=ff}' type64='{CGSize=dd}'/>
-  </function>
-  <function name='NSStringFromClass'>
-    <arg name='aClass' declared_type='Class' type='#'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSStringFromHashTable'>
-    <arg name='table' declared_type='NSHashTable*' type='@'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSStringFromMapTable'>
-    <arg name='table' declared_type='NSMapTable*' type='@'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSStringFromPoint'>
-    <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSStringFromProtocol'>
-    <arg name='proto' declared_type='Protocol*' type='@'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSStringFromRange'>
-    <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSStringFromRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSStringFromSelector'>
-    <arg name='aSelector' declared_type='SEL' type=':'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSStringFromSize'>
-    <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSSwapBigDoubleToHost' inline='true'>
-    <arg name='x' declared_type='NSSwappedDouble' type='{_NSSwappedDouble=Q}'/>
-    <retval declared_type='double' type='d'/>
-  </function>
-  <function name='NSSwapBigFloatToHost' inline='true'>
-    <arg name='x' declared_type='NSSwappedFloat' type='{_NSSwappedFloat=I}'/>
-    <retval declared_type='float' type='f'/>
-  </function>
-  <function name='NSSwapBigIntToHost' inline='true'>
-    <arg name='x' declared_type='unsigned int' type='I'/>
-    <retval declared_type='unsigned int' type='I'/>
-  </function>
-  <function name='NSSwapBigLongLongToHost' inline='true'>
-    <arg name='x' declared_type='unsigned long long' type='Q'/>
-    <retval declared_type='unsigned long long' type='Q'/>
-  </function>
-  <function name='NSSwapBigLongToHost' inline='true'>
-    <arg name='x' declared_type='unsigned long' type='L' type64='Q'/>
-    <retval declared_type='unsigned long' type='L' type64='Q'/>
-  </function>
-  <function name='NSSwapBigShortToHost' inline='true'>
-    <arg name='x' declared_type='unsigned short' type='S'/>
-    <retval declared_type='unsigned short' type='S'/>
-  </function>
-  <function name='NSSwapDouble' inline='true'>
-    <arg name='x' declared_type='NSSwappedDouble' type='{_NSSwappedDouble=Q}'/>
-    <retval declared_type='NSSwappedDouble' type='{_NSSwappedDouble=Q}'/>
-  </function>
-  <function name='NSSwapFloat' inline='true'>
-    <arg name='x' declared_type='NSSwappedFloat' type='{_NSSwappedFloat=I}'/>
-    <retval declared_type='NSSwappedFloat' type='{_NSSwappedFloat=I}'/>
-  </function>
-  <function name='NSSwapHostDoubleToBig' inline='true'>
-    <arg name='x' declared_type='double' type='d'/>
-    <retval declared_type='NSSwappedDouble' type='{_NSSwappedDouble=Q}'/>
-  </function>
-  <function name='NSSwapHostDoubleToLittle' inline='true'>
-    <arg name='x' declared_type='double' type='d'/>
-    <retval declared_type='NSSwappedDouble' type='{_NSSwappedDouble=Q}'/>
-  </function>
-  <function name='NSSwapHostFloatToBig' inline='true'>
-    <arg name='x' declared_type='float' type='f'/>
-    <retval declared_type='NSSwappedFloat' type='{_NSSwappedFloat=I}'/>
-  </function>
-  <function name='NSSwapHostFloatToLittle' inline='true'>
-    <arg name='x' declared_type='float' type='f'/>
-    <retval declared_type='NSSwappedFloat' type='{_NSSwappedFloat=I}'/>
-  </function>
-  <function name='NSSwapHostIntToBig' inline='true'>
-    <arg name='x' declared_type='unsigned int' type='I'/>
-    <retval declared_type='unsigned int' type='I'/>
-  </function>
-  <function name='NSSwapHostIntToLittle' inline='true'>
-    <arg name='x' declared_type='unsigned int' type='I'/>
-    <retval declared_type='unsigned int' type='I'/>
-  </function>
-  <function name='NSSwapHostLongLongToBig' inline='true'>
-    <arg name='x' declared_type='unsigned long long' type='Q'/>
-    <retval declared_type='unsigned long long' type='Q'/>
-  </function>
-  <function name='NSSwapHostLongLongToLittle' inline='true'>
-    <arg name='x' declared_type='unsigned long long' type='Q'/>
-    <retval declared_type='unsigned long long' type='Q'/>
-  </function>
-  <function name='NSSwapHostLongToBig' inline='true'>
-    <arg name='x' declared_type='unsigned long' type='L' type64='Q'/>
-    <retval declared_type='unsigned long' type='L' type64='Q'/>
-  </function>
-  <function name='NSSwapHostLongToLittle' inline='true'>
-    <arg name='x' declared_type='unsigned long' type='L' type64='Q'/>
-    <retval declared_type='unsigned long' type='L' type64='Q'/>
-  </function>
-  <function name='NSSwapHostShortToBig' inline='true'>
-    <arg name='x' declared_type='unsigned short' type='S'/>
-    <retval declared_type='unsigned short' type='S'/>
-  </function>
-  <function name='NSSwapHostShortToLittle' inline='true'>
-    <arg name='x' declared_type='unsigned short' type='S'/>
-    <retval declared_type='unsigned short' type='S'/>
-  </function>
-  <function name='NSSwapInt' inline='true'>
-    <arg name='inv' declared_type='unsigned int' type='I'/>
-    <retval declared_type='unsigned int' type='I'/>
-  </function>
-  <function name='NSSwapLittleDoubleToHost' inline='true'>
-    <arg name='x' declared_type='NSSwappedDouble' type='{_NSSwappedDouble=Q}'/>
-    <retval declared_type='double' type='d'/>
-  </function>
-  <function name='NSSwapLittleFloatToHost' inline='true'>
-    <arg name='x' declared_type='NSSwappedFloat' type='{_NSSwappedFloat=I}'/>
-    <retval declared_type='float' type='f'/>
-  </function>
-  <function name='NSSwapLittleIntToHost' inline='true'>
-    <arg name='x' declared_type='unsigned int' type='I'/>
-    <retval declared_type='unsigned int' type='I'/>
-  </function>
-  <function name='NSSwapLittleLongLongToHost' inline='true'>
-    <arg name='x' declared_type='unsigned long long' type='Q'/>
-    <retval declared_type='unsigned long long' type='Q'/>
-  </function>
-  <function name='NSSwapLittleLongToHost' inline='true'>
-    <arg name='x' declared_type='unsigned long' type='L' type64='Q'/>
-    <retval declared_type='unsigned long' type='L' type64='Q'/>
-  </function>
-  <function name='NSSwapLittleShortToHost' inline='true'>
-    <arg name='x' declared_type='unsigned short' type='S'/>
-    <retval declared_type='unsigned short' type='S'/>
-  </function>
-  <function name='NSSwapLong' inline='true'>
-    <arg name='inv' declared_type='unsigned long' type='L' type64='Q'/>
-    <retval declared_type='unsigned long' type='L' type64='Q'/>
-  </function>
-  <function name='NSSwapLongLong' inline='true'>
-    <arg name='inv' declared_type='unsigned long long' type='Q'/>
-    <retval declared_type='unsigned long long' type='Q'/>
-  </function>
-  <function name='NSSwapShort' inline='true'>
-    <arg name='inv' declared_type='unsigned short' type='S'/>
-    <retval declared_type='unsigned short' type='S'/>
-  </function>
-  <function name='NSTemporaryDirectory'>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSUnionRange'>
-    <arg name='range1' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    <arg name='range2' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-  </function>
-  <function name='NSUnionRect'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <arg name='bRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-  </function>
-  <function name='NSUserName'>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSWidth' inline='true'>
-    <arg name='aRect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    <retval declared_type='CGFloat' type='f' type64='d'/>
-  </function>
-  <function name='NSZoneCalloc'>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <arg name='numElems' declared_type='NSUInteger' type='I' type64='Q'/>
-    <arg name='byteSize' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NSZoneFree'>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <arg name='ptr' declared_type='void*' type='^v' type_modifier='n'/>
-  </function>
-  <function name='NSZoneFromPointer'>
-    <arg name='ptr' declared_type='void*' type='^v' type_modifier='n'/>
-    <retval declared_type='NSZone*' type='^{_NSZone=}'/>
-  </function>
-  <function name='NSZoneMalloc'>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <arg name='size' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NSZoneName'>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <retval declared_type='NSString*' type='@'/>
-  </function>
-  <function name='NSZoneRealloc'>
-    <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' type_modifier='n'/>
-    <arg name='ptr' declared_type='void*' type='^v' type_modifier='n'/>
-    <arg name='size' declared_type='NSUInteger' type='I' type64='Q'/>
-    <retval declared_type='void*' type='^v'/>
-  </function>
-  <function name='NXReadNSObjectFromCoder'>
-    <arg name='decoder' declared_type='NSCoder*' type='@'/>
-    <retval declared_type='NSObject*' type='@'/>
-  </function>
-  <class name='NSAffineTransform'>
-    <method selector='appendTransform:'>
-      <arg name='transform' declared_type='NSAffineTransform*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithTransform:'>
-      <arg name='transform' declared_type='NSAffineTransform*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='invert'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='prependTransform:'>
-      <arg name='transform' declared_type='NSAffineTransform*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rotateByDegrees:'>
-      <arg name='angle' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='rotateByRadians:'>
-      <arg name='angle' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scaleBy:'>
-      <arg name='scale' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scaleXBy:yBy:'>
-      <arg name='scaleX' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='scaleY' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTransformStruct:'>
-      <arg name='transformStruct' declared_type='NSAffineTransformStruct' type='{_NSAffineTransformStruct=ffffff}' type64='{_NSAffineTransformStruct=dddddd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='transform'>
-      <retval declared_type='NSAffineTransform*' type='@'/>
-    </method>
-    <method selector='transformPoint:'>
-      <arg name='aPoint' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='transformSize:'>
-      <arg name='aSize' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='transformStruct'>
-      <retval declared_type='NSAffineTransformStruct' type='{_NSAffineTransformStruct=ffffff}' type64='{_NSAffineTransformStruct=dddddd}'/>
-    </method>
-    <method selector='translateXBy:yBy:'>
-      <arg name='deltaX' declared_type='CGFloat' type='f' type64='d' index='0'/>
-      <arg name='deltaY' declared_type='CGFloat' type='f' type64='d' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSAppleEventDescriptor'>
-    <method selector='aeDesc'>
-      <retval declared_type='AEDesc*' type='^{AEDesc=I^^{OpaqueAEDataStorageType}}' const='true'/>
-    </method>
-    <method class_method='true' selector='appleEventWithEventClass:eventID:targetDescriptor:returnID:transactionID:'>
-      <arg name='eventClass' declared_type='AEEventClass' type='L' type64='I' index='0'/>
-      <arg name='eventID' declared_type='AEEventID' type='L' type64='I' index='1'/>
-      <arg name='targetDescriptor' declared_type='NSAppleEventDescriptor*' type='@' index='2'/>
-      <arg name='returnID' declared_type='AEReturnID' type='s' index='3'/>
-      <arg name='transactionID' declared_type='AETransactionID' type='l' type64='i' index='4'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='attributeDescriptorForKeyword:'>
-      <arg name='keyword' declared_type='AEKeyword' type='L' type64='I' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='booleanValue'>
-      <retval declared_type='Boolean' type='B'/>
-    </method>
-    <method selector='coerceToDescriptorType:'>
-      <arg name='descriptorType' declared_type='DescType' type='L' type64='I' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='data'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='descriptorAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='descriptorForKeyword:'>
-      <arg name='keyword' declared_type='AEKeyword' type='L' type64='I' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='descriptorType'>
-      <retval declared_type='DescType' type='L' type64='I'/>
-    </method>
-    <method class_method='true' selector='descriptorWithBoolean:'>
-      <arg name='boolean' declared_type='Boolean' type='B' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method class_method='true' selector='descriptorWithDescriptorType:bytes:length:'>
-      <arg name='descriptorType' declared_type='DescType' type='L' type64='I' index='0'/>
-      <arg name='bytes' declared_type='void*' type='^v' const='true' index='1'/>
-      <arg name='byteCount' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method class_method='true' selector='descriptorWithDescriptorType:data:'>
-      <arg name='descriptorType' declared_type='DescType' type='L' type64='I' index='0'/>
-      <arg name='data' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method class_method='true' selector='descriptorWithEnumCode:'>
-      <arg name='enumerator' declared_type='OSType' type='L' type64='I' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method class_method='true' selector='descriptorWithInt32:'>
-      <arg name='signedInt' declared_type='SInt32' type='l' type64='i' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method class_method='true' selector='descriptorWithString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method class_method='true' selector='descriptorWithTypeCode:'>
-      <arg name='typeCode' declared_type='OSType' type='L' type64='I' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='enumCodeValue'>
-      <retval declared_type='OSType' type='L' type64='I'/>
-    </method>
-    <method selector='eventClass'>
-      <retval declared_type='AEEventClass' type='L' type64='I'/>
-    </method>
-    <method selector='eventID'>
-      <retval declared_type='AEEventID' type='L' type64='I'/>
-    </method>
-    <method selector='initListDescriptor'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initRecordDescriptor'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithAEDescNoCopy:'>
-      <arg name='aeDesc' declared_type='AEDesc*' type='^{AEDesc=I^^{OpaqueAEDataStorageType}}' const='true' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithDescriptorType:bytes:length:'>
-      <arg name='descriptorType' declared_type='DescType' type='L' type64='I' index='0'/>
-      <arg name='bytes' declared_type='void*' type='^v' const='true' index='1'/>
-      <arg name='byteCount' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithDescriptorType:data:'>
-      <arg name='descriptorType' declared_type='DescType' type='L' type64='I' index='0'/>
-      <arg name='data' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithEventClass:eventID:targetDescriptor:returnID:transactionID:'>
-      <arg name='eventClass' declared_type='AEEventClass' type='L' type64='I' index='0'/>
-      <arg name='eventID' declared_type='AEEventID' type='L' type64='I' index='1'/>
-      <arg name='targetDescriptor' declared_type='NSAppleEventDescriptor*' type='@' index='2'/>
-      <arg name='returnID' declared_type='AEReturnID' type='s' index='3'/>
-      <arg name='transactionID' declared_type='AETransactionID' type='l' type64='i' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertDescriptor:atIndex:'>
-      <arg name='descriptor' declared_type='NSAppleEventDescriptor*' type='@' index='0'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='int32Value'>
-      <retval declared_type='SInt32' type='l' type64='i'/>
-    </method>
-    <method selector='keywordForDescriptorAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='AEKeyword' type='L' type64='I'/>
-    </method>
-    <method class_method='true' selector='listDescriptor'>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method class_method='true' selector='nullDescriptor'>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='numberOfItems'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='paramDescriptorForKeyword:'>
-      <arg name='keyword' declared_type='AEKeyword' type='L' type64='I' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method class_method='true' selector='recordDescriptor'>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='removeDescriptorAtIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeDescriptorWithKeyword:'>
-      <arg name='keyword' declared_type='AEKeyword' type='L' type64='I' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeParamDescriptorWithKeyword:'>
-      <arg name='keyword' declared_type='AEKeyword' type='L' type64='I' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='returnID'>
-      <retval declared_type='AEReturnID' type='s'/>
-    </method>
-    <method selector='setAttributeDescriptor:forKeyword:'>
-      <arg name='descriptor' declared_type='NSAppleEventDescriptor*' type='@' index='0'/>
-      <arg name='keyword' declared_type='AEKeyword' type='L' type64='I' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDescriptor:forKeyword:'>
-      <arg name='descriptor' declared_type='NSAppleEventDescriptor*' type='@' index='0'/>
-      <arg name='keyword' declared_type='AEKeyword' type='L' type64='I' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setParamDescriptor:forKeyword:'>
-      <arg name='descriptor' declared_type='NSAppleEventDescriptor*' type='@' index='0'/>
-      <arg name='keyword' declared_type='AEKeyword' type='L' type64='I' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stringValue'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='transactionID'>
-      <retval declared_type='AETransactionID' type='l' type64='i'/>
-    </method>
-    <method selector='typeCodeValue'>
-      <retval declared_type='OSType' type='L' type64='I'/>
-    </method>
-  </class>
-  <class name='NSAppleEventManager'>
-    <method selector='appleEventForSuspensionID:'>
-      <arg name='suspensionID' declared_type='NSAppleEventManagerSuspensionID' type='^{__NSAppleEventManagerSuspension=}' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='currentAppleEvent'>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='currentReplyAppleEvent'>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='dispatchRawAppleEvent:withRawReply:handlerRefCon:'>
-      <arg name='theAppleEvent' declared_type='AppleEvent*' type='^{AEDesc=I^^{OpaqueAEDataStorageType}}' const='true' index='0'/>
-      <arg name='theReply' declared_type='AppleEvent*' type='^{AEDesc=I^^{OpaqueAEDataStorageType}}' index='1'/>
-      <arg name='handlerRefCon' declared_type='SRefCon' type='l' type64='^v' index='2'/>
-      <retval declared_type='OSErr' type='s'/>
-    </method>
-    <method selector='removeEventHandlerForEventClass:andEventID:'>
-      <arg name='eventClass' declared_type='AEEventClass' type='L' type64='I' index='0'/>
-      <arg name='eventID' declared_type='AEEventID' type='L' type64='I' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replyAppleEventForSuspensionID:'>
-      <arg name='suspensionID' declared_type='NSAppleEventManagerSuspensionID' type='^{__NSAppleEventManagerSuspension=}' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='resumeWithSuspensionID:'>
-      <arg name='suspensionID' declared_type='NSAppleEventManagerSuspensionID' type='^{__NSAppleEventManagerSuspension=}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCurrentAppleEventAndReplyEventWithSuspensionID:'>
-      <arg name='suspensionID' declared_type='NSAppleEventManagerSuspensionID' type='^{__NSAppleEventManagerSuspension=}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEventHandler:andSelector:forEventClass:andEventID:'>
-      <arg name='handler' declared_type='id' type='@' index='0'/>
-      <arg name='handleEventSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='eventClass' declared_type='AEEventClass' type='L' type64='I' index='2'/>
-      <arg name='eventID' declared_type='AEEventID' type='L' type64='I' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedAppleEventManager'>
-      <retval declared_type='NSAppleEventManager*' type='@'/>
-    </method>
-    <method selector='suspendCurrentAppleEvent'>
-      <retval declared_type='NSAppleEventManagerSuspensionID' type='^{__NSAppleEventManagerSuspension=}'/>
-    </method>
-  </class>
-  <class name='NSAppleScript'>
-    <method selector='compileAndReturnError:'>
-      <arg name='errorInfo' declared_type='NSDictionary**' type='^@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='executeAndReturnError:'>
-      <arg name='errorInfo' declared_type='NSDictionary**' type='^@' index='0'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='executeAppleEvent:error:'>
-      <arg name='event' declared_type='NSAppleEventDescriptor*' type='@' index='0'/>
-      <arg name='errorInfo' declared_type='NSDictionary**' type='^@' index='1'/>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='errorInfo' declared_type='NSDictionary**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithSource:'>
-      <arg name='source' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isCompiled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='source'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSArchiver'>
-    <method class_method='true' selector='archiveRootObject:toFile:'>
-      <arg name='rootObject' declared_type='id' type='@' index='0'/>
-      <arg name='path' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='archivedDataWithRootObject:'>
-      <arg name='rootObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='archiverData'>
-      <retval declared_type='NSMutableData*' type='@'/>
-    </method>
-    <method selector='classNameEncodedForTrueClassName:'>
-      <arg name='trueName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='encodeClassName:intoClassName:'>
-      <arg name='trueName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='inArchiveName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeConditionalObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeRootObject:'>
-      <arg name='rootObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initForWritingWithMutableData:'>
-      <arg name='mdata' declared_type='NSMutableData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='replaceObject:withObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <arg name='newObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSArray'>
-    <method selector='addObserver:forKeyPath:options:context:'>
-      <arg name='observer' declared_type='NSObject*' type='@' index='0'/>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='options' declared_type='NSKeyValueObservingOptions' type='I' type64='Q' index='2'/>
-      <arg name='context' declared_type='void*' type='^v' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addObserver:toObjectsAtIndexes:forKeyPath:options:context:'>
-      <arg name='observer' declared_type='NSObject*' type='@' index='0'/>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='1'/>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='2'/>
-      <arg name='options' declared_type='NSKeyValueObservingOptions' type='I' type64='Q' index='3'/>
-      <arg name='context' declared_type='void*' type='^v' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='array'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='arrayByAddingObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='arrayByAddingObjectsFromArray:'>
-      <arg name='otherArray' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='arrayWithArray:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='arrayWithContentsOfFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='arrayWithContentsOfURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='arrayWithObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' variadic='true' selector='arrayWithObjects:'>
-      <arg name='arrayWithObjects' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='arrayWithObjects:count:'>
-      <arg name='objects' declared_type='id*' type='^@' const='true' index='0'/>
-      <arg name='cnt' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='componentsJoinedByString:'>
-      <arg name='separator' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='containsObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='count'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='description'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='descriptionWithLocale:'>
-      <arg name='locale' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='descriptionWithLocale:indent:'>
-      <arg name='locale' declared_type='id' type='@' index='0'/>
-      <arg name='level' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='filteredArrayUsingPredicate:'>
-      <arg name='predicate' declared_type='NSPredicate*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='firstObjectCommonWithArray:'>
-      <arg name='otherArray' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='getObjects:'>
-      <arg name='objects' declared_type='id*' type='^@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getObjects:range:'>
-      <arg name='objects' declared_type='id*' type='^@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='indexOfObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='indexOfObject:inRange:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='indexOfObjectIdenticalTo:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='indexOfObjectIdenticalTo:inRange:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='initWithArray:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithArray:copyItems:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method variadic='true' selector='initWithObjects:'>
-      <arg name='initWithObjects' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithObjects:count:'>
-      <arg name='objects' declared_type='id*' type='^@' const='true' index='0'/>
-      <arg name='cnt' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isEqualToArray:'>
-      <arg name='otherArray' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='lastObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='makeObjectsPerformSelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='makeObjectsPerformSelector:withObject:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='argument' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='objectAtIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectEnumerator'>
-      <retval declared_type='NSEnumerator*' type='@'/>
-    </method>
-    <method selector='objectsAtIndexes:'>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='pathsMatchingExtensions:'>
-      <arg name='filterTypes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='removeObserver:forKeyPath:'>
-      <arg name='observer' declared_type='NSObject*' type='@' index='0'/>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObserver:fromObjectsAtIndexes:forKeyPath:'>
-      <arg name='observer' declared_type='NSObject*' type='@' index='0'/>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='1'/>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='reverseObjectEnumerator'>
-      <retval declared_type='NSEnumerator*' type='@'/>
-    </method>
-    <method selector='setValue:forKey:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sortedArrayHint'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='sortedArrayUsingDescriptors:'>
-      <arg name='sortDescriptors' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='sortedArrayUsingFunction:context:'>
-      <arg name='comparator' function_pointer='true' declared_type='NSInteger *id, id, void*' type='^?' index='0' type_modifier='n'>
-        <arg declared_type='id' type='@'/>
-        <arg declared_type='id' type='@'/>
-        <arg declared_type='void*' type='^v'/>
-        <retval declared_type='NSInteger' type='i' type64='q'/>
-      </arg>
-      <arg name='context' declared_type='void*' type='^v' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='sortedArrayUsingFunction:context:hint:'>
-      <arg name='comparator' function_pointer='true' declared_type='NSInteger *id, id, void*' type='^?' index='0' type_modifier='n'>
-        <arg declared_type='id' type='@'/>
-        <arg declared_type='id' type='@'/>
-        <arg declared_type='void*' type='^v'/>
-        <retval declared_type='NSInteger' type='i' type64='q'/>
-      </arg>
-      <arg name='context' declared_type='void*' type='^v' index='1'/>
-      <arg name='hint' declared_type='NSData*' type='@' index='2'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='sortedArrayUsingSelector:'>
-      <arg name='comparator' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='subarrayWithRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='valueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='writeToFile:atomically:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='useAuxiliaryFile' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToURL:atomically:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='atomically' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSAssertionHandler'>
-    <method class_method='true' selector='currentHandler'>
-      <retval declared_type='NSAssertionHandler*' type='@'/>
-    </method>
-    <method variadic='true' selector='handleFailureInFunction:file:lineNumber:description:'>
-      <arg name='functionName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='fileName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='line' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='description' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method variadic='true' selector='handleFailureInMethod:object:file:lineNumber:description:'>
-      <arg name='selector' declared_type='SEL' type=':' index='0'/>
-      <arg name='object' declared_type='id' type='@' index='1'/>
-      <arg name='fileName' declared_type='NSString*' type='@' index='2'/>
-      <arg name='line' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <arg name='description' declared_type='NSString*' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSAttributedString'>
-    <method selector='attribute:atIndex:effectiveRange:'>
-      <arg name='attrName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='attribute:atIndex:longestEffectiveRange:inRange:'>
-      <arg name='attrName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <arg name='rangeLimit' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='attributedSubstringFromRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='attributesAtIndex:effectiveRange:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='attributesAtIndex:longestEffectiveRange:inRange:'>
-      <arg name='location' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <arg name='rangeLimit' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='initWithAttributedString:'>
-      <arg name='attrStr' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithString:'>
-      <arg name='str' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithString:attributes:'>
-      <arg name='str' declared_type='NSString*' type='@' index='0'/>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isEqualToAttributedString:'>
-      <arg name='other' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='string'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSAutoreleasePool'>
-    <method class_method='true' selector='addObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='autoreleasedObjectCount'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='drain'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='enableFreedObjectCheck:'>
-      <arg name='enable' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='enableRelease:'>
-      <arg name='enable' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='poolCountHighWaterMark'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='poolCountHighWaterResolution'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='resetTotalAutoreleasedObjects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setPoolCountHighWaterMark:'>
-      <arg name='count' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setPoolCountHighWaterResolution:'>
-      <arg name='res' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='showPools'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='topAutoreleasePoolCount'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='totalAutoreleasedObjects'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-  </class>
-  <class name='NSBundle'>
-    <method class_method='true' selector='allBundles'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='allFrameworks'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='builtInPlugInsPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='bundleForClass:'>
-      <arg name='aClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='NSBundle*' type='@'/>
-    </method>
-    <method selector='bundleIdentifier'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='bundlePath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='bundleWithIdentifier:'>
-      <arg name='identifier' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSBundle*' type='@'/>
-    </method>
-    <method class_method='true' selector='bundleWithPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSBundle*' type='@'/>
-    </method>
-    <method selector='classNamed:'>
-      <arg name='className' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='developmentLocalization'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='executableArchitectures'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='executablePath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='infoDictionary'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='initWithPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isLoaded'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='load'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='loadAndReturnError:'>
-      <arg name='error' declared_type='NSError**' type='^@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='localizations'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='localizedInfoDictionary'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='localizedStringForKey:value:table:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='value' declared_type='NSString*' type='@' index='1'/>
-      <arg name='tableName' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='mainBundle'>
-      <retval declared_type='NSBundle*' type='@'/>
-    </method>
-    <method selector='objectForInfoDictionaryKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='pathForAuxiliaryExecutable:'>
-      <arg name='executableName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pathForResource:ofType:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='ext' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pathForResource:ofType:inDirectory:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='ext' declared_type='NSString*' type='@' index='1'/>
-      <arg name='subpath' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='pathForResource:ofType:inDirectory:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='ext' declared_type='NSString*' type='@' index='1'/>
-      <arg name='bundlePath' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pathForResource:ofType:inDirectory:forLocalization:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='ext' declared_type='NSString*' type='@' index='1'/>
-      <arg name='subpath' declared_type='NSString*' type='@' index='2'/>
-      <arg name='localizationName' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='pathsForResourcesOfType:inDirectory:'>
-      <arg name='ext' declared_type='NSString*' type='@' index='0'/>
-      <arg name='bundlePath' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='pathsForResourcesOfType:inDirectory:'>
-      <arg name='ext' declared_type='NSString*' type='@' index='0'/>
-      <arg name='subpath' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='pathsForResourcesOfType:inDirectory:forLocalization:'>
-      <arg name='ext' declared_type='NSString*' type='@' index='0'/>
-      <arg name='subpath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='localizationName' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='preferredLocalizations'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='preferredLocalizationsFromArray:'>
-      <arg name='localizationsArray' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='preferredLocalizationsFromArray:forPreferences:'>
-      <arg name='localizationsArray' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='preferencesArray' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='preflightAndReturnError:'>
-      <arg name='error' declared_type='NSError**' type='^@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='principalClass'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='privateFrameworksPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='resourcePath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='sharedFrameworksPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='sharedSupportPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='unload'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSCachedURLResponse'>
-    <method selector='data'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='initWithResponse:data:'>
-      <arg name='response' declared_type='NSURLResponse*' type='@' index='0'/>
-      <arg name='data' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithResponse:data:userInfo:storagePolicy:'>
-      <arg name='response' declared_type='NSURLResponse*' type='@' index='0'/>
-      <arg name='data' declared_type='NSData*' type='@' index='1'/>
-      <arg name='userInfo' declared_type='NSDictionary*' type='@' index='2'/>
-      <arg name='storagePolicy' declared_type='NSURLCacheStoragePolicy' type='I' type64='Q' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='response'>
-      <retval declared_type='NSURLResponse*' type='@'/>
-    </method>
-    <method selector='storagePolicy'>
-      <retval declared_type='NSURLCacheStoragePolicy' type='I' type64='Q'/>
-    </method>
-    <method selector='userInfo'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-  </class>
-  <class name='NSCalendar'>
-    <method class_method='true' selector='autoupdatingCurrentCalendar'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='calendarIdentifier'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='components:fromDate:'>
-      <arg name='unitFlags' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='date' declared_type='NSDate*' type='@' index='1'/>
-      <retval declared_type='NSDateComponents*' type='@'/>
-    </method>
-    <method selector='components:fromDate:toDate:options:'>
-      <arg name='unitFlags' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='startingDate' declared_type='NSDate*' type='@' index='1'/>
-      <arg name='resultDate' declared_type='NSDate*' type='@' index='2'/>
-      <arg name='opts' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <retval declared_type='NSDateComponents*' type='@'/>
-    </method>
-    <method class_method='true' selector='currentCalendar'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='dateByAddingComponents:toDate:options:'>
-      <arg name='comps' declared_type='NSDateComponents*' type='@' index='0'/>
-      <arg name='date' declared_type='NSDate*' type='@' index='1'/>
-      <arg name='opts' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='dateFromComponents:'>
-      <arg name='comps' declared_type='NSDateComponents*' type='@' index='0'/>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='firstWeekday'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='initWithCalendarIdentifier:'>
-      <arg name='ident' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='locale'>
-      <retval declared_type='NSLocale*' type='@'/>
-    </method>
-    <method selector='maximumRangeOfUnit:'>
-      <arg name='unit' declared_type='NSCalendarUnit' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='minimumDaysInFirstWeek'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='minimumRangeOfUnit:'>
-      <arg name='unit' declared_type='NSCalendarUnit' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='ordinalityOfUnit:inUnit:forDate:'>
-      <arg name='smaller' declared_type='NSCalendarUnit' type='I' type64='Q' index='0'/>
-      <arg name='larger' declared_type='NSCalendarUnit' type='I' type64='Q' index='1'/>
-      <arg name='date' declared_type='NSDate*' type='@' index='2'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='rangeOfUnit:inUnit:forDate:'>
-      <arg name='smaller' declared_type='NSCalendarUnit' type='I' type64='Q' index='0'/>
-      <arg name='larger' declared_type='NSCalendarUnit' type='I' type64='Q' index='1'/>
-      <arg name='date' declared_type='NSDate*' type='@' index='2'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeOfUnit:startDate:interval:forDate:'>
-      <arg name='unit' declared_type='NSCalendarUnit' type='I' type64='Q' index='0'/>
-      <arg name='datep' declared_type='NSDate**' type='^@' index='1'/>
-      <arg name='tip' declared_type='NSTimeInterval*' type='^d' index='2'/>
-      <arg name='date' declared_type='NSDate*' type='@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setFirstWeekday:'>
-      <arg name='weekday' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocale:'>
-      <arg name='locale' declared_type='NSLocale*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinimumDaysInFirstWeek:'>
-      <arg name='mdw' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTimeZone:'>
-      <arg name='tz' declared_type='NSTimeZone*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='timeZone'>
-      <retval declared_type='NSTimeZone*' type='@'/>
-    </method>
-  </class>
-  <class name='NSCalendarDate'>
-    <method class_method='true' selector='calendarDate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='calendarFormat'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='dateByAddingYears:months:days:hours:minutes:seconds:'>
-      <arg name='year' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='month' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='day' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='hour' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <arg name='minute' declared_type='NSInteger' type='i' type64='q' index='4'/>
-      <arg name='second' declared_type='NSInteger' type='i' type64='q' index='5'/>
-      <retval declared_type='NSCalendarDate*' type='@'/>
-    </method>
-    <method class_method='true' selector='dateWithString:calendarFormat:'>
-      <arg name='description' declared_type='NSString*' type='@' index='0'/>
-      <arg name='format' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dateWithString:calendarFormat:locale:'>
-      <arg name='description' declared_type='NSString*' type='@' index='0'/>
-      <arg name='format' declared_type='NSString*' type='@' index='1'/>
-      <arg name='locale' declared_type='id' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dateWithYear:month:day:hour:minute:second:timeZone:'>
-      <arg name='year' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='month' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='day' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='hour' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <arg name='minute' declared_type='NSUInteger' type='I' type64='Q' index='4'/>
-      <arg name='second' declared_type='NSUInteger' type='I' type64='Q' index='5'/>
-      <arg name='aTimeZone' declared_type='NSTimeZone*' type='@' index='6'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='dayOfCommonEra'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='dayOfMonth'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='dayOfWeek'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='dayOfYear'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='description'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='descriptionWithCalendarFormat:'>
-      <arg name='format' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='descriptionWithCalendarFormat:locale:'>
-      <arg name='format' declared_type='NSString*' type='@' index='0'/>
-      <arg name='locale' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='descriptionWithLocale:'>
-      <arg name='locale' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='hourOfDay'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='initWithString:'>
-      <arg name='description' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithString:calendarFormat:'>
-      <arg name='description' declared_type='NSString*' type='@' index='0'/>
-      <arg name='format' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithString:calendarFormat:locale:'>
-      <arg name='description' declared_type='NSString*' type='@' index='0'/>
-      <arg name='format' declared_type='NSString*' type='@' index='1'/>
-      <arg name='locale' declared_type='id' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithYear:month:day:hour:minute:second:timeZone:'>
-      <arg name='year' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='month' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='day' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='hour' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <arg name='minute' declared_type='NSUInteger' type='I' type64='Q' index='4'/>
-      <arg name='second' declared_type='NSUInteger' type='I' type64='Q' index='5'/>
-      <arg name='aTimeZone' declared_type='NSTimeZone*' type='@' index='6'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='minuteOfHour'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='monthOfYear'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='secondOfMinute'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setCalendarFormat:'>
-      <arg name='format' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTimeZone:'>
-      <arg name='aTimeZone' declared_type='NSTimeZone*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='timeZone'>
-      <retval declared_type='NSTimeZone*' type='@'/>
-    </method>
-    <method selector='yearOfCommonEra'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='years:months:days:hours:minutes:seconds:sinceDate:'>
-      <arg name='yp' declared_type='NSInteger*' type='^i' type64='^q' index='0'/>
-      <arg name='mop' declared_type='NSInteger*' type='^i' type64='^q' index='1'/>
-      <arg name='dp' declared_type='NSInteger*' type='^i' type64='^q' index='2'/>
-      <arg name='hp' declared_type='NSInteger*' type='^i' type64='^q' index='3'/>
-      <arg name='mip' declared_type='NSInteger*' type='^i' type64='^q' index='4'/>
-      <arg name='sp' declared_type='NSInteger*' type='^i' type64='^q' index='5'/>
-      <arg name='date' declared_type='NSCalendarDate*' type='@' index='6'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSCharacterSet'>
-    <method class_method='true' selector='alphanumericCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='bitmapRepresentation'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method class_method='true' selector='capitalizedLetterCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='characterIsMember:'>
-      <arg name='aCharacter' declared_type='unichar' type='S' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='characterSetWithBitmapRepresentation:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='characterSetWithCharactersInString:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='characterSetWithContentsOfFile:'>
-      <arg name='fName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='characterSetWithRange:'>
-      <arg name='aRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='controlCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='decimalDigitCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='decomposableCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='hasMemberInPlane:'>
-      <arg name='thePlane' declared_type='uint8_t' type='C' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='illegalCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='invertedSet'>
-      <retval declared_type='NSCharacterSet*' type='@'/>
-    </method>
-    <method selector='isSupersetOfSet:'>
-      <arg name='theOtherSet' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='letterCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='longCharacterIsMember:'>
-      <arg name='theLongChar' declared_type='UTF32Char' type='L' type64='I' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='lowercaseLetterCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='newlineCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='nonBaseCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='punctuationCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='symbolCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='uppercaseLetterCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='whitespaceAndNewlineCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='whitespaceCharacterSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSClassDescription'>
-    <method selector='attributeKeys'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='classDescriptionForClass:'>
-      <arg name='aClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='NSClassDescription*' type='@'/>
-    </method>
-    <method class_method='true' selector='invalidateClassDescriptionCache'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='inverseForRelationshipKey:'>
-      <arg name='relationshipKey' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='registerClassDescription:forClass:'>
-      <arg name='description' declared_type='NSClassDescription*' type='@' index='0'/>
-      <arg name='aClass' declared_type='Class' type='#' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toManyRelationshipKeys'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='toOneRelationshipKeys'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSCloneCommand'>
-    <method selector='keySpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='setReceiversSpecifier:'>
-      <arg name='receiversRef' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSCloseCommand'>
-    <method selector='saveOptions'>
-      <retval declared_type='NSSaveOptions' type='I' type64='Q'/>
-    </method>
-  </class>
-  <class name='NSCoder'>
-    <method selector='allowsKeyedCoding'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='containsValueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='decodeArrayOfObjCType:count:at:'>
-      <arg name='itemType' declared_type='char*' type='*' const='true' index='0'/>
-      <arg name='count' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='array' declared_type='void*' type='^v' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='decodeBoolForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='decodeBytesForKey:returnedLength:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='lengthp' declared_type='NSUInteger*' type='^I' type64='^Q' index='1'/>
-      <retval declared_type='uint8_t*' type='*' const='true'/>
-    </method>
-    <method selector='decodeBytesWithReturnedLength:'>
-      <arg name='lengthp' declared_type='NSUInteger*' type='^I' type64='^Q' index='0'/>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='decodeDataObject'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='decodeDoubleForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='decodeFloatForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='decodeInt32ForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='int32_t' type='i'/>
-    </method>
-    <method selector='decodeInt64ForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='int64_t' type='q'/>
-    </method>
-    <method selector='decodeIntForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='decodeIntegerForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='decodeNXObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='decodeObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='decodeObjectForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='decodePoint'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='decodePointForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='decodePropertyList'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='decodeRect'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='decodeRectForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='decodeSize'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='decodeSizeForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method selector='decodeValueOfObjCType:at:'>
-      <arg name='type' declared_type='char*' type='*' const='true' index='0'/>
-      <arg name='data' declared_type='void*' type='^v' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method ignore='true' variadic='true' suggestion='Call decodeValueOfObjCType:at: several times.' selector='decodeValuesOfObjCTypes:'>
-      <arg name='decodeValuesOfObjCTypes' declared_type='char*' type='*' const='true' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeArrayOfObjCType:count:at:'>
-      <arg name='type' declared_type='char*' type='*' const='true' index='0'/>
-      <arg name='count' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='array' declared_type='void*' type='^v' const='true' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeBool:forKey:'>
-      <arg name='boolv' declared_type='BOOL' type='B' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeBycopyObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeByrefObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeBytes:length:'>
-      <arg name='byteaddr' declared_type='void*' type='^v' const='true' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeBytes:length:forKey:'>
-      <arg name='bytesp' declared_type='uint8_t*' type='*' const='true' index='0'/>
-      <arg name='lenv' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='key' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeConditionalObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeConditionalObject:forKey:'>
-      <arg name='objv' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeDataObject:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeDouble:forKey:'>
-      <arg name='realv' declared_type='double' type='d' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeFloat:forKey:'>
-      <arg name='realv' declared_type='float' type='f' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeInt32:forKey:'>
-      <arg name='intv' declared_type='int32_t' type='i' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeInt64:forKey:'>
-      <arg name='intv' declared_type='int64_t' type='q' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeInt:forKey:'>
-      <arg name='intv' declared_type='int' type='i' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeInteger:forKey:'>
-      <arg name='intv' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeNXObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeObject:forKey:'>
-      <arg name='objv' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodePoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodePoint:forKey:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodePropertyList:'>
-      <arg name='aPropertyList' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeRect:forKey:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeRootObject:'>
-      <arg name='rootObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeSize:forKey:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeValueOfObjCType:at:'>
-      <arg name='type' declared_type='char*' type='*' const='true' index='0'/>
-      <arg name='addr' declared_type='void*' type='^v' const='true' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method ignore='true' variadic='true' suggestion='Call encodeValueOfObjCType:at: several times.' selector='encodeValuesOfObjCTypes:'>
-      <arg name='encodeValuesOfObjCTypes' declared_type='char*' type='*' const='true' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='objectZone'>
-      <retval declared_type='NSZone*' type='^{_NSZone=}'/>
-    </method>
-    <method selector='setObjectZone:'>
-      <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='systemVersion'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-    <method selector='versionForClassName:'>
-      <arg name='className' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-  </class>
-  <class name='NSComparisonPredicate'>
-    <method selector='comparisonPredicateModifier'>
-      <retval declared_type='NSComparisonPredicateModifier' type='I' type64='Q'/>
-    </method>
-    <method selector='customSelector'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='initWithLeftExpression:rightExpression:customSelector:'>
-      <arg name='lhs' declared_type='NSExpression*' type='@' index='0'/>
-      <arg name='rhs' declared_type='NSExpression*' type='@' index='1'/>
-      <arg name='selector' declared_type='SEL' type=':' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithLeftExpression:rightExpression:modifier:type:options:'>
-      <arg name='lhs' declared_type='NSExpression*' type='@' index='0'/>
-      <arg name='rhs' declared_type='NSExpression*' type='@' index='1'/>
-      <arg name='modifier' declared_type='NSComparisonPredicateModifier' type='I' type64='Q' index='2'/>
-      <arg name='type' declared_type='NSPredicateOperatorType' type='I' type64='Q' index='3'/>
-      <arg name='options' declared_type='NSUInteger' type='I' type64='Q' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='leftExpression'>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method selector='options'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='predicateOperatorType'>
-      <retval declared_type='NSPredicateOperatorType' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='predicateWithLeftExpression:rightExpression:customSelector:'>
-      <arg name='lhs' declared_type='NSExpression*' type='@' index='0'/>
-      <arg name='rhs' declared_type='NSExpression*' type='@' index='1'/>
-      <arg name='selector' declared_type='SEL' type=':' index='2'/>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method class_method='true' selector='predicateWithLeftExpression:rightExpression:modifier:type:options:'>
-      <arg name='lhs' declared_type='NSExpression*' type='@' index='0'/>
-      <arg name='rhs' declared_type='NSExpression*' type='@' index='1'/>
-      <arg name='modifier' declared_type='NSComparisonPredicateModifier' type='I' type64='Q' index='2'/>
-      <arg name='type' declared_type='NSPredicateOperatorType' type='I' type64='Q' index='3'/>
-      <arg name='options' declared_type='NSUInteger' type='I' type64='Q' index='4'/>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method selector='rightExpression'>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-  </class>
-  <class name='NSCompoundPredicate'>
-    <method class_method='true' selector='andPredicateWithSubpredicates:'>
-      <arg name='subpredicates' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method selector='compoundPredicateType'>
-      <retval declared_type='NSCompoundPredicateType' type='I' type64='Q'/>
-    </method>
-    <method selector='initWithType:subpredicates:'>
-      <arg name='type' declared_type='NSCompoundPredicateType' type='I' type64='Q' index='0'/>
-      <arg name='subpredicates' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='notPredicateWithSubpredicate:'>
-      <arg name='predicate' declared_type='NSPredicate*' type='@' index='0'/>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method class_method='true' selector='orPredicateWithSubpredicates:'>
-      <arg name='subpredicates' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method selector='subpredicates'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSCondition'>
-    <method selector='broadcast'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setName:'>
-      <arg name='n' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='signal'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='wait'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='waitUntilDate:'>
-      <arg name='limit' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSConditionLock'>
-    <method selector='condition'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='initWithCondition:'>
-      <arg name='condition' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='lockBeforeDate:'>
-      <arg name='limit' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='lockWhenCondition:'>
-      <arg name='condition' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='lockWhenCondition:beforeDate:'>
-      <arg name='condition' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='limit' declared_type='NSDate*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setName:'>
-      <arg name='n' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tryLock'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='tryLockWhenCondition:'>
-      <arg name='condition' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='unlockWithCondition:'>
-      <arg name='condition' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSConnection'>
-    <method selector='addRequestMode:'>
-      <arg name='rmode' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addRunLoop:'>
-      <arg name='runloop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='allConnections'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='connectionWithReceivePort:sendPort:'>
-      <arg name='receivePort' declared_type='NSPort*' type='@' index='0'/>
-      <arg name='sendPort' declared_type='NSPort*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='connectionWithRegisteredName:host:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='hostName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='connectionWithRegisteredName:host:usingNameServer:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='hostName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='server' declared_type='NSPortNameServer*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='currentConversation'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='defaultConnection'>
-      <retval declared_type='NSConnection*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='enableMultipleThreads'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='independentConversationQueueing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initWithReceivePort:sendPort:'>
-      <arg name='receivePort' declared_type='NSPort*' type='@' index='0'/>
-      <arg name='sendPort' declared_type='NSPort*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='invalidate'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isValid'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='localObjects'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='multipleThreadsEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='receivePort'>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='registerName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='registerName:withNameServer:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='server' declared_type='NSPortNameServer*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='remoteObjects'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='removeRequestMode:'>
-      <arg name='rmode' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeRunLoop:'>
-      <arg name='runloop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replyTimeout'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='requestModes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='requestTimeout'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='rootObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='rootProxy'>
-      <retval declared_type='NSDistantObject*' type='@'/>
-    </method>
-    <method class_method='true' selector='rootProxyForConnectionWithRegisteredName:host:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='hostName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSDistantObject*' type='@'/>
-    </method>
-    <method class_method='true' selector='rootProxyForConnectionWithRegisteredName:host:usingNameServer:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='hostName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='server' declared_type='NSPortNameServer*' type='@' index='2'/>
-      <retval declared_type='NSDistantObject*' type='@'/>
-    </method>
-    <method selector='runInNewThread'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sendPort'>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method class_method='true' selector='serviceConnectionWithName:rootObject:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='root' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='serviceConnectionWithName:rootObject:usingNameServer:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='root' declared_type='id' type='@' index='1'/>
-      <arg name='server' declared_type='NSPortNameServer*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIndependentConversationQueueing:'>
-      <arg name='yorn' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setReplyTimeout:'>
-      <arg name='ti' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRequestTimeout:'>
-      <arg name='ti' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRootObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='statistics'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-  </class>
-  <class name='NSCountedSet'>
-    <method selector='addObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='countForObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='initWithArray:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithCapacity:'>
-      <arg name='numItems' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithSet:'>
-      <arg name='set' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectEnumerator'>
-      <retval declared_type='NSEnumerator*' type='@'/>
-    </method>
-    <method selector='removeObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSCreateCommand'>
-    <method selector='createClassDescription'>
-      <retval declared_type='NSScriptClassDescription*' type='@'/>
-    </method>
-    <method selector='resolvedKeyDictionary'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-  </class>
-  <class name='NSData'>
-    <method selector='bytes'>
-      <retval declared_type='void*' type='^v' const='true'/>
-    </method>
-    <method class_method='true' selector='data'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dataWithBytes:length:'>
-      <arg name='bytes' declared_type='void*' type='^v' const='true' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dataWithBytesNoCopy:length:'>
-      <arg name='bytes' declared_type='void*' type='^v' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method ignore='true' class_method='true' suggestion='Call dataWithBytes:length:.' selector='dataWithBytesNoCopy:length:freeWhenDone:'>
-      <arg name='bytes' declared_type='void*' type='^v' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='b' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dataWithContentsOfFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dataWithContentsOfFile:options:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='readOptionsMask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='errorPtr' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dataWithContentsOfMappedFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dataWithContentsOfURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dataWithContentsOfURL:options:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='readOptionsMask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='errorPtr' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dataWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='description'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='getBytes:'>
-      <arg name='buffer' declared_type='void*' type='^v' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getBytes:length:'>
-      <arg name='buffer' declared_type='void*' type='^v' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getBytes:range:'>
-      <arg name='buffer' declared_type='void*' type='^v' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithBytes:length:'>
-      <arg name='bytes' declared_type='void*' type='^v' const='true' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithBytesNoCopy:length:'>
-      <arg name='bytes' declared_type='void*' type='^v' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method ignore='true' suggestion='Call initWithBytes:length:.' selector='initWithBytesNoCopy:length:freeWhenDone:'>
-      <arg name='bytes' declared_type='void*' type='^v' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='b' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfFile:options:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='readOptionsMask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='errorPtr' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfMappedFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:options:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='readOptionsMask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='errorPtr' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isEqualToData:'>
-      <arg name='other' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='subdataWithRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='writeToFile:atomically:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='useAuxiliaryFile' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToFile:options:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='writeOptionsMask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='errorPtr' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToURL:atomically:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='atomically' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToURL:options:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='writeOptionsMask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='errorPtr' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSDate'>
-    <method selector='addTimeInterval:'>
-      <arg name='seconds' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='compare:'>
-      <arg name='other' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='date'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='dateWithCalendarFormat:timeZone:'>
-      <arg name='format' declared_type='NSString*' type='@' index='0'/>
-      <arg name='aTimeZone' declared_type='NSTimeZone*' type='@' index='1'/>
-      <retval declared_type='NSCalendarDate*' type='@'/>
-    </method>
-    <method class_method='true' selector='dateWithNaturalLanguageString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dateWithNaturalLanguageString:locale:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='locale' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dateWithString:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dateWithTimeIntervalSince1970:'>
-      <arg name='secs' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dateWithTimeIntervalSinceNow:'>
-      <arg name='secs' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dateWithTimeIntervalSinceReferenceDate:'>
-      <arg name='secs' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='description'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='descriptionWithCalendarFormat:timeZone:locale:'>
-      <arg name='format' declared_type='NSString*' type='@' index='0'/>
-      <arg name='aTimeZone' declared_type='NSTimeZone*' type='@' index='1'/>
-      <arg name='locale' declared_type='id' type='@' index='2'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='descriptionWithLocale:'>
-      <arg name='locale' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='distantFuture'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='distantPast'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='earlierDate:'>
-      <arg name='anotherDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithString:'>
-      <arg name='description' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithTimeInterval:sinceDate:'>
-      <arg name='secsToBeAdded' declared_type='NSTimeInterval' type='d' index='0'/>
-      <arg name='anotherDate' declared_type='NSDate*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithTimeIntervalSinceNow:'>
-      <arg name='secsToBeAddedToNow' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithTimeIntervalSinceReferenceDate:'>
-      <arg name='secsToBeAdded' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isEqualToDate:'>
-      <arg name='otherDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='laterDate:'>
-      <arg name='anotherDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='timeIntervalSince1970'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='timeIntervalSinceDate:'>
-      <arg name='anotherDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='timeIntervalSinceNow'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method class_method='true' selector='timeIntervalSinceReferenceDate'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='timeIntervalSinceReferenceDate'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-  </class>
-  <class name='NSDateComponents'>
-    <method selector='day'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='era'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='hour'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='minute'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='month'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='second'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='setDay:'>
-      <arg name='v' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEra:'>
-      <arg name='v' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHour:'>
-      <arg name='v' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinute:'>
-      <arg name='v' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMonth:'>
-      <arg name='v' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSecond:'>
-      <arg name='v' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWeek:'>
-      <arg name='v' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWeekday:'>
-      <arg name='v' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWeekdayOrdinal:'>
-      <arg name='v' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setYear:'>
-      <arg name='v' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='week'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='weekday'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='weekdayOrdinal'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='year'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-  </class>
-  <class name='NSDateFormatter'>
-    <method selector='AMSymbol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='PMSymbol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='allowsNaturalLanguage'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='calendar'>
-      <retval declared_type='NSCalendar*' type='@'/>
-    </method>
-    <method selector='dateFormat'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='dateFromString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='dateStyle'>
-      <retval declared_type='NSDateFormatterStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='defaultDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method class_method='true' selector='defaultFormatterBehavior'>
-      <retval declared_type='NSDateFormatterBehavior' type='I' type64='Q'/>
-    </method>
-    <method selector='eraSymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='formatterBehavior'>
-      <retval declared_type='NSDateFormatterBehavior' type='I' type64='Q'/>
-    </method>
-    <method selector='generatesCalendarDates'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='getObjectValue:forString:range:error:'>
-      <arg name='obj' declared_type='id*' type='^@' index='0'/>
-      <arg name='string' declared_type='NSString*' type='@' index='1'/>
-      <arg name='rangep' declared_type='inout NSRange*' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='gregorianStartDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithDateFormat:allowNaturalLanguage:'>
-      <arg name='format' declared_type='NSString*' type='@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isLenient'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='locale'>
-      <retval declared_type='NSLocale*' type='@'/>
-    </method>
-    <method selector='longEraSymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='monthSymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='quarterSymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='setAMSymbol:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCalendar:'>
-      <arg name='calendar' declared_type='NSCalendar*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDateFormat:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDateStyle:'>
-      <arg name='style' declared_type='NSDateFormatterStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDefaultDate:'>
-      <arg name='date' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setDefaultFormatterBehavior:'>
-      <arg name='behavior' declared_type='NSDateFormatterBehavior' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEraSymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFormatterBehavior:'>
-      <arg name='behavior' declared_type='NSDateFormatterBehavior' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGeneratesCalendarDates:'>
-      <arg name='b' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGregorianStartDate:'>
-      <arg name='date' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLenient:'>
-      <arg name='b' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocale:'>
-      <arg name='locale' declared_type='NSLocale*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLongEraSymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMonthSymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPMSymbol:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setQuarterSymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShortMonthSymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShortQuarterSymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShortStandaloneMonthSymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShortStandaloneQuarterSymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShortStandaloneWeekdaySymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShortWeekdaySymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStandaloneMonthSymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStandaloneQuarterSymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStandaloneWeekdaySymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTimeStyle:'>
-      <arg name='style' declared_type='NSDateFormatterStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTimeZone:'>
-      <arg name='tz' declared_type='NSTimeZone*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTwoDigitStartDate:'>
-      <arg name='date' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVeryShortMonthSymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVeryShortStandaloneMonthSymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVeryShortStandaloneWeekdaySymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVeryShortWeekdaySymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWeekdaySymbols:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shortMonthSymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='shortQuarterSymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='shortStandaloneMonthSymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='shortStandaloneQuarterSymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='shortStandaloneWeekdaySymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='shortWeekdaySymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='standaloneMonthSymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='standaloneQuarterSymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='standaloneWeekdaySymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='stringFromDate:'>
-      <arg name='date' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='timeStyle'>
-      <retval declared_type='NSDateFormatterStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='timeZone'>
-      <retval declared_type='NSTimeZone*' type='@'/>
-    </method>
-    <method selector='twoDigitStartDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='veryShortMonthSymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='veryShortStandaloneMonthSymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='veryShortStandaloneWeekdaySymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='veryShortWeekdaySymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='weekdaySymbols'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSDecimalNumber'>
-    <method selector='compare:'>
-      <arg name='decimalNumber' declared_type='NSNumber*' type='@' index='0'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method selector='decimalNumberByAdding:'>
-      <arg name='decimalNumber' declared_type='NSDecimalNumber*' type='@' index='0'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalNumberByAdding:withBehavior:'>
-      <arg name='decimalNumber' declared_type='NSDecimalNumber*' type='@' index='0'/>
-      <arg name='behavior' declared_type='id &lt;NSDecimalNumberBehaviors&gt;' type='@' index='1'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalNumberByDividingBy:'>
-      <arg name='decimalNumber' declared_type='NSDecimalNumber*' type='@' index='0'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalNumberByDividingBy:withBehavior:'>
-      <arg name='decimalNumber' declared_type='NSDecimalNumber*' type='@' index='0'/>
-      <arg name='behavior' declared_type='id &lt;NSDecimalNumberBehaviors&gt;' type='@' index='1'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalNumberByMultiplyingBy:'>
-      <arg name='decimalNumber' declared_type='NSDecimalNumber*' type='@' index='0'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalNumberByMultiplyingBy:withBehavior:'>
-      <arg name='decimalNumber' declared_type='NSDecimalNumber*' type='@' index='0'/>
-      <arg name='behavior' declared_type='id &lt;NSDecimalNumberBehaviors&gt;' type='@' index='1'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalNumberByMultiplyingByPowerOf10:'>
-      <arg name='power' declared_type='short' type='s' index='0'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalNumberByMultiplyingByPowerOf10:withBehavior:'>
-      <arg name='power' declared_type='short' type='s' index='0'/>
-      <arg name='behavior' declared_type='id &lt;NSDecimalNumberBehaviors&gt;' type='@' index='1'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalNumberByRaisingToPower:'>
-      <arg name='power' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalNumberByRaisingToPower:withBehavior:'>
-      <arg name='power' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='behavior' declared_type='id &lt;NSDecimalNumberBehaviors&gt;' type='@' index='1'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalNumberByRoundingAccordingToBehavior:'>
-      <arg name='behavior' declared_type='id &lt;NSDecimalNumberBehaviors&gt;' type='@' index='0'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalNumberBySubtracting:'>
-      <arg name='decimalNumber' declared_type='NSDecimalNumber*' type='@' index='0'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalNumberBySubtracting:withBehavior:'>
-      <arg name='decimalNumber' declared_type='NSDecimalNumber*' type='@' index='0'/>
-      <arg name='behavior' declared_type='id &lt;NSDecimalNumberBehaviors&gt;' type='@' index='1'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='decimalNumberWithDecimal:'>
-      <arg name='dcm' declared_type='NSDecimal' type='{_NSDecimal=b8b4b1b1b18[8S]}' index='0'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='decimalNumberWithMantissa:exponent:isNegative:'>
-      <arg name='mantissa' declared_type='unsigned long long' type='Q' index='0'/>
-      <arg name='exponent' declared_type='short' type='s' index='1'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='decimalNumberWithString:'>
-      <arg name='numberValue' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='decimalNumberWithString:locale:'>
-      <arg name='numberValue' declared_type='NSString*' type='@' index='0'/>
-      <arg name='locale' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='decimalValue'>
-      <retval declared_type='NSDecimal' type='{_NSDecimal=b8b4b1b1b18[8S]}'/>
-    </method>
-    <method class_method='true' selector='defaultBehavior'>
-      <retval declared_type='id &lt;NSDecimalNumberBehaviors&gt;' type='@'/>
-    </method>
-    <method selector='descriptionWithLocale:'>
-      <arg name='locale' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='doubleValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='initWithDecimal:'>
-      <arg name='dcm' declared_type='NSDecimal' type='{_NSDecimal=b8b4b1b1b18[8S]}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithMantissa:exponent:isNegative:'>
-      <arg name='mantissa' declared_type='unsigned long long' type='Q' index='0'/>
-      <arg name='exponent' declared_type='short' type='s' index='1'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithString:'>
-      <arg name='numberValue' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithString:locale:'>
-      <arg name='numberValue' declared_type='NSString*' type='@' index='0'/>
-      <arg name='locale' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='maximumDecimalNumber'>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='minimumDecimalNumber'>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='notANumber'>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='objCType'>
-      <retval declared_type='char*' type='*' const='true'/>
-    </method>
-    <method class_method='true' selector='one'>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='setDefaultBehavior:'>
-      <arg name='behavior' declared_type='id &lt;NSDecimalNumberBehaviors&gt;' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='zero'>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-  </class>
-  <class name='NSDecimalNumberHandler'>
-    <method class_method='true' selector='decimalNumberHandlerWithRoundingMode:scale:raiseOnExactness:raiseOnOverflow:raiseOnUnderflow:raiseOnDivideByZero:'>
-      <arg name='roundingMode' declared_type='NSRoundingMode' type='I' type64='Q' index='0'/>
-      <arg name='scale' declared_type='short' type='s' index='1'/>
-      <arg name='exact' declared_type='BOOL' type='B' index='2'/>
-      <arg name='overflow' declared_type='BOOL' type='B' index='3'/>
-      <arg name='underflow' declared_type='BOOL' type='B' index='4'/>
-      <arg name='divideByZero' declared_type='BOOL' type='B' index='5'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='defaultDecimalNumberHandler'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithRoundingMode:scale:raiseOnExactness:raiseOnOverflow:raiseOnUnderflow:raiseOnDivideByZero:'>
-      <arg name='roundingMode' declared_type='NSRoundingMode' type='I' type64='Q' index='0'/>
-      <arg name='scale' declared_type='short' type='s' index='1'/>
-      <arg name='exact' declared_type='BOOL' type='B' index='2'/>
-      <arg name='overflow' declared_type='BOOL' type='B' index='3'/>
-      <arg name='underflow' declared_type='BOOL' type='B' index='4'/>
-      <arg name='divideByZero' declared_type='BOOL' type='B' index='5'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSDeleteCommand'>
-    <method selector='keySpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='setReceiversSpecifier:'>
-      <arg name='receiversRef' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSDictionary'>
-    <method selector='allKeys'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='allKeysForObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='allValues'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='count'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='description'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='descriptionInStringsFileFormat'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='descriptionWithLocale:'>
-      <arg name='locale' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='descriptionWithLocale:indent:'>
-      <arg name='locale' declared_type='id' type='@' index='0'/>
-      <arg name='level' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='dictionary'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dictionaryWithContentsOfFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dictionaryWithContentsOfURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dictionaryWithDictionary:'>
-      <arg name='dict' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dictionaryWithObject:forKey:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dictionaryWithObjects:forKeys:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='keys' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dictionaryWithObjects:forKeys:count:'>
-      <arg name='objects' declared_type='id*' type='^@' index='0'/>
-      <arg name='keys' declared_type='id*' type='^@' index='1'/>
-      <arg name='cnt' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' variadic='true' selector='dictionaryWithObjectsAndKeys:'>
-      <arg name='dictionaryWithObjectsAndKeys' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='fileCreationDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='fileExtensionHidden'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileGroupOwnerAccountID'>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method selector='fileGroupOwnerAccountName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fileHFSCreatorCode'>
-      <retval declared_type='OSType' type='L' type64='I'/>
-    </method>
-    <method selector='fileHFSTypeCode'>
-      <retval declared_type='OSType' type='L' type64='I'/>
-    </method>
-    <method selector='fileIsAppendOnly'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileIsImmutable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileModificationDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='fileOwnerAccountID'>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method selector='fileOwnerAccountName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='filePosixPermissions'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='fileSize'>
-      <retval declared_type='unsigned long long' type='Q'/>
-    </method>
-    <method selector='fileSystemFileNumber'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='fileSystemNumber'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='fileType'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='getObjects:andKeys:'>
-      <arg name='objects' declared_type='id*' type='^@' index='0'/>
-      <arg name='keys' declared_type='id*' type='^@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithContentsOfFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithDictionary:'>
-      <arg name='otherDictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithDictionary:copyItems:'>
-      <arg name='otherDictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithObjects:forKeys:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='keys' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithObjects:forKeys:count:'>
-      <arg name='objects' declared_type='id*' type='^@' index='0'/>
-      <arg name='keys' declared_type='id*' type='^@' index='1'/>
-      <arg name='cnt' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method variadic='true' selector='initWithObjectsAndKeys:'>
-      <arg name='initWithObjectsAndKeys' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isEqualToDictionary:'>
-      <arg name='otherDictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keyEnumerator'>
-      <retval declared_type='NSEnumerator*' type='@'/>
-    </method>
-    <method selector='keysSortedByValueUsingSelector:'>
-      <arg name='comparator' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='objectEnumerator'>
-      <retval declared_type='NSEnumerator*' type='@'/>
-    </method>
-    <method selector='objectForKey:'>
-      <arg name='aKey' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectsForKeys:notFoundMarker:'>
-      <arg name='keys' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='marker' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='valueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='writeToFile:atomically:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='useAuxiliaryFile' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToURL:atomically:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='atomically' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSDirectoryEnumerator'>
-    <method selector='directoryAttributes'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='fileAttributes'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='skipDescendents'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSDistantObject'>
-    <method selector='connectionForProxy'>
-      <retval declared_type='NSConnection*' type='@'/>
-    </method>
-    <method selector='initWithLocal:connection:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <arg name='connection' declared_type='NSConnection*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithTarget:connection:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <arg name='connection' declared_type='NSConnection*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='proxyWithLocal:connection:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <arg name='connection' declared_type='NSConnection*' type='@' index='1'/>
-      <retval declared_type='NSDistantObject*' type='@'/>
-    </method>
-    <method class_method='true' selector='proxyWithTarget:connection:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <arg name='connection' declared_type='NSConnection*' type='@' index='1'/>
-      <retval declared_type='NSDistantObject*' type='@'/>
-    </method>
-    <method selector='setProtocolForProxy:'>
-      <arg name='proto' declared_type='Protocol*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSDistantObjectRequest'>
-    <method selector='connection'>
-      <retval declared_type='NSConnection*' type='@'/>
-    </method>
-    <method selector='conversation'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='invocation'>
-      <retval declared_type='NSInvocation*' type='@'/>
-    </method>
-    <method selector='replyWithException:'>
-      <arg name='exception' declared_type='NSException*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSDistributedLock'>
-    <method selector='breakLock'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='lockDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method class_method='true' selector='lockWithPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDistributedLock*' type='@'/>
-    </method>
-    <method selector='tryLock'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='unlock'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSDistributedNotificationCenter'>
-    <method selector='addObserver:selector:name:object:'>
-      <arg name='observer' declared_type='id' type='@' index='0'/>
-      <arg name='aSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='aName' declared_type='NSString*' type='@' index='2'/>
-      <arg name='anObject' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addObserver:selector:name:object:suspensionBehavior:'>
-      <arg name='observer' declared_type='id' type='@' index='0'/>
-      <arg name='selector' declared_type='SEL' type=':' index='1'/>
-      <arg name='name' declared_type='NSString*' type='@' index='2'/>
-      <arg name='object' declared_type='NSString*' type='@' index='3'/>
-      <arg name='suspensionBehavior' declared_type='NSNotificationSuspensionBehavior' type='I' type64='Q' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='defaultCenter'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='notificationCenterForType:'>
-      <arg name='notificationCenterType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDistributedNotificationCenter*' type='@'/>
-    </method>
-    <method selector='postNotificationName:object:'>
-      <arg name='aName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='anObject' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='postNotificationName:object:userInfo:'>
-      <arg name='aName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='anObject' declared_type='NSString*' type='@' index='1'/>
-      <arg name='aUserInfo' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='postNotificationName:object:userInfo:deliverImmediately:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='object' declared_type='NSString*' type='@' index='1'/>
-      <arg name='userInfo' declared_type='NSDictionary*' type='@' index='2'/>
-      <arg name='deliverImmediately' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='postNotificationName:object:userInfo:options:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='object' declared_type='NSString*' type='@' index='1'/>
-      <arg name='userInfo' declared_type='NSDictionary*' type='@' index='2'/>
-      <arg name='options' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObserver:name:object:'>
-      <arg name='observer' declared_type='id' type='@' index='0'/>
-      <arg name='aName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='anObject' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSuspended:'>
-      <arg name='suspended' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='suspended'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSEnumerator'>
-    <method selector='allObjects'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='nextObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSError'>
-    <method selector='code'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='domain'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='errorWithDomain:code:userInfo:'>
-      <arg name='domain' declared_type='NSString*' type='@' index='0'/>
-      <arg name='code' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='dict' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithDomain:code:userInfo:'>
-      <arg name='domain' declared_type='NSString*' type='@' index='0'/>
-      <arg name='code' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='dict' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='localizedDescription'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='localizedFailureReason'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='localizedRecoveryOptions'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='localizedRecoverySuggestion'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='recoveryAttempter'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='userInfo'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-  </class>
-  <class name='NSException'>
-    <method selector='callStackReturnAddresses'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='exceptionWithName:reason:userInfo:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='reason' declared_type='NSString*' type='@' index='1'/>
-      <arg name='userInfo' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='NSException*' type='@'/>
-    </method>
-    <method selector='initWithName:reason:userInfo:'>
-      <arg name='aName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='aReason' declared_type='NSString*' type='@' index='1'/>
-      <arg name='aUserInfo' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='raise'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' variadic='true' selector='raise:format:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='format' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='raise:format:arguments:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='format' declared_type='NSString*' type='@' index='1'/>
-      <arg name='argList' declared_type='va_list' type='*' type64='[1{?=II^v^v}]' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='reason'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='userInfo'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-  </class>
-  <class name='NSExpression'>
-    <method selector='arguments'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='collection'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='constantValue'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='expressionForAggregate:'>
-      <arg name='subexpressions' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method class_method='true' selector='expressionForConstantValue:'>
-      <arg name='obj' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method class_method='true' selector='expressionForEvaluatedObject'>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method class_method='true' selector='expressionForFunction:arguments:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='parameters' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method class_method='true' selector='expressionForFunction:selectorName:arguments:'>
-      <arg name='target' declared_type='NSExpression*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <arg name='parameters' declared_type='NSArray*' type='@' index='2'/>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method class_method='true' selector='expressionForIntersectSet:with:'>
-      <arg name='left' declared_type='NSExpression*' type='@' index='0'/>
-      <arg name='right' declared_type='NSExpression*' type='@' index='1'/>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method class_method='true' selector='expressionForKeyPath:'>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method class_method='true' selector='expressionForMinusSet:with:'>
-      <arg name='left' declared_type='NSExpression*' type='@' index='0'/>
-      <arg name='right' declared_type='NSExpression*' type='@' index='1'/>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method class_method='true' selector='expressionForSubquery:usingIteratorVariable:predicate:'>
-      <arg name='expression' declared_type='NSExpression*' type='@' index='0'/>
-      <arg name='variable' declared_type='NSString*' type='@' index='1'/>
-      <arg name='predicate' declared_type='id' type='@' index='2'/>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method class_method='true' selector='expressionForUnionSet:with:'>
-      <arg name='left' declared_type='NSExpression*' type='@' index='0'/>
-      <arg name='right' declared_type='NSExpression*' type='@' index='1'/>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method class_method='true' selector='expressionForVariable:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method selector='expressionType'>
-      <retval declared_type='NSExpressionType' type='I' type64='Q'/>
-    </method>
-    <method selector='expressionValueWithObject:context:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <arg name='context' declared_type='NSMutableDictionary*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='function'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='initWithExpressionType:'>
-      <arg name='type' declared_type='NSExpressionType' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='keyPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='leftExpression'>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method selector='operand'>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method selector='predicate'>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method selector='rightExpression'>
-      <retval declared_type='NSExpression*' type='@'/>
-    </method>
-    <method selector='variable'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSFileHandle'>
-    <method selector='acceptConnectionInBackgroundAndNotify'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='acceptConnectionInBackgroundAndNotifyForModes:'>
-      <arg name='modes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='availableData'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='closeFile'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='fileDescriptor'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method class_method='true' selector='fileHandleForReadingAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='fileHandleForUpdatingAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='fileHandleForWritingAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='fileHandleWithNullDevice'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='fileHandleWithStandardError'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='fileHandleWithStandardInput'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='fileHandleWithStandardOutput'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithFileDescriptor:'>
-      <arg name='fd' declared_type='int' type='i' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithFileDescriptor:closeOnDealloc:'>
-      <arg name='fd' declared_type='int' type='i' index='0'/>
-      <arg name='closeopt' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='offsetInFile'>
-      <retval declared_type='unsigned long long' type='Q'/>
-    </method>
-    <method selector='readDataOfLength:'>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='readDataToEndOfFile'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='readInBackgroundAndNotify'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='readInBackgroundAndNotifyForModes:'>
-      <arg name='modes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='readToEndOfFileInBackgroundAndNotify'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='readToEndOfFileInBackgroundAndNotifyForModes:'>
-      <arg name='modes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='seekToEndOfFile'>
-      <retval declared_type='unsigned long long' type='Q'/>
-    </method>
-    <method selector='seekToFileOffset:'>
-      <arg name='offset' declared_type='unsigned long long' type='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='synchronizeFile'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='truncateFileAtOffset:'>
-      <arg name='offset' declared_type='unsigned long long' type='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='waitForDataInBackgroundAndNotify'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='waitForDataInBackgroundAndNotifyForModes:'>
-      <arg name='modes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='writeData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSFileManager'>
-    <method selector='attributesOfFileSystemForPath:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='attributesOfItemAtPath:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='changeCurrentDirectoryPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='changeFileAttributes:atPath:'>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='path' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='componentsToDisplayForPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='contentsAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='contentsEqualAtPath:andPath:'>
-      <arg name='path1' declared_type='NSString*' type='@' index='0'/>
-      <arg name='path2' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='contentsOfDirectoryAtPath:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='copyItemAtPath:toPath:error:'>
-      <arg name='srcPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='dstPath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='copyPath:toPath:handler:'>
-      <arg name='src' declared_type='NSString*' type='@' index='0'/>
-      <arg name='dest' declared_type='NSString*' type='@' index='1'/>
-      <arg name='handler' declared_type='id' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='createDirectoryAtPath:attributes:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='createDirectoryAtPath:withIntermediateDirectories:attributes:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='createIntermediates' declared_type='BOOL' type='B' index='1'/>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='2'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='createFileAtPath:contents:attributes:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='data' declared_type='NSData*' type='@' index='1'/>
-      <arg name='attr' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='createSymbolicLinkAtPath:pathContent:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='otherpath' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='createSymbolicLinkAtPath:withDestinationPath:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='destPath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='currentDirectoryPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='defaultManager'>
-      <retval declared_type='NSFileManager*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='destinationOfSymbolicLinkAtPath:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='directoryContentsAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='displayNameAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='enumeratorAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDirectoryEnumerator*' type='@'/>
-    </method>
-    <method selector='fileAttributesAtPath:traverseLink:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='yorn' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='fileExistsAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileExistsAtPath:isDirectory:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='isDirectory' declared_type='BOOL*' type='^B' index='1' type_modifier='o'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileSystemAttributesAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='fileSystemRepresentationWithPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='char*' type='*' const='true'/>
-    </method>
-    <method selector='isDeletableFileAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isExecutableFileAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isReadableFileAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isWritableFileAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='linkItemAtPath:toPath:error:'>
-      <arg name='srcPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='dstPath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='linkPath:toPath:handler:'>
-      <arg name='src' declared_type='NSString*' type='@' index='0'/>
-      <arg name='dest' declared_type='NSString*' type='@' index='1'/>
-      <arg name='handler' declared_type='id' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='moveItemAtPath:toPath:error:'>
-      <arg name='srcPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='dstPath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='movePath:toPath:handler:'>
-      <arg name='src' declared_type='NSString*' type='@' index='0'/>
-      <arg name='dest' declared_type='NSString*' type='@' index='1'/>
-      <arg name='handler' declared_type='id' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='pathContentOfSymbolicLinkAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='removeFileAtPath:handler:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='handler' declared_type='id' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='removeItemAtPath:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setAttributes:ofItemAtPath:error:'>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='path' declared_type='NSString*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stringWithFileSystemRepresentation:length:'>
-      <arg name='str' declared_type='char*' type='*' const='true' index='0'/>
-      <arg name='len' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='subpathsAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='subpathsOfDirectoryAtPath:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSFormatter'>
-    <method selector='attributedStringForObjectValue:withDefaultAttributes:'>
-      <arg name='obj' declared_type='id' type='@' index='0'/>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='editingStringForObjectValue:'>
-      <arg name='obj' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='getObjectValue:forString:errorDescription:'>
-      <arg name='obj' declared_type='id*' type='^@' index='0'/>
-      <arg name='string' declared_type='NSString*' type='@' index='1'/>
-      <arg name='error' declared_type='NSString**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isPartialStringValid:newEditingString:errorDescription:'>
-      <arg name='partialString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='newString' declared_type='NSString**' type='^@' index='1'/>
-      <arg name='error' declared_type='NSString**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isPartialStringValid:proposedSelectedRange:originalString:originalSelectedRange:errorDescription:'>
-      <arg name='partialStringPtr' declared_type='NSString**' type='^@' index='0'/>
-      <arg name='proposedSelRangePtr' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='1'/>
-      <arg name='origString' declared_type='NSString*' type='@' index='2'/>
-      <arg name='origSelRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <arg name='error' declared_type='NSString**' type='^@' index='4'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='stringForObjectValue:'>
-      <arg name='obj' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSGarbageCollector'>
-    <method selector='collectExhaustively'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='collectIfNeeded'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='defaultCollector'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='disable'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='disableCollectorForPointer:'>
-      <arg name='ptr' declared_type='void*' type='^v' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='enable'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='enableCollectorForPointer:'>
-      <arg name='ptr' declared_type='void*' type='^v' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isCollecting'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='zone'>
-      <retval declared_type='NSZone*' type='^{_NSZone=}'/>
-    </method>
-  </class>
-  <class name='NSHTTPCookie'>
-    <method selector='comment'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='commentURL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method class_method='true' selector='cookieWithProperties:'>
-      <arg name='properties' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='cookiesWithResponseHeaderFields:forURL:'>
-      <arg name='headerFields' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='URL' declared_type='NSURL*' type='@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='domain'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='expiresDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='initWithProperties:'>
-      <arg name='properties' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isSecure'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSessionOnly'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='path'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='portList'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='properties'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method class_method='true' selector='requestHeaderFieldsWithCookies:'>
-      <arg name='cookies' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='value'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='version'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-  </class>
-  <class name='NSHTTPCookieStorage'>
-    <method selector='cookieAcceptPolicy'>
-      <retval declared_type='NSHTTPCookieAcceptPolicy' type='I' type64='Q'/>
-    </method>
-    <method selector='cookies'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='cookiesForURL:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='deleteCookie:'>
-      <arg name='cookie' declared_type='NSHTTPCookie*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCookie:'>
-      <arg name='cookie' declared_type='NSHTTPCookie*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCookieAcceptPolicy:'>
-      <arg name='cookieAcceptPolicy' declared_type='NSHTTPCookieAcceptPolicy' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCookies:forURL:mainDocumentURL:'>
-      <arg name='cookies' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='URL' declared_type='NSURL*' type='@' index='1'/>
-      <arg name='mainDocumentURL' declared_type='NSURL*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedHTTPCookieStorage'>
-      <retval declared_type='NSHTTPCookieStorage*' type='@'/>
-    </method>
-  </class>
-  <class name='NSHTTPURLResponse'>
-    <method selector='allHeaderFields'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method class_method='true' selector='localizedStringForStatusCode:'>
-      <arg name='statusCode' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='statusCode'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-  </class>
-  <class name='NSHashTable'>
-    <method selector='addObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='allObjects'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='anyObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='containsObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='count'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='hashTableWithOptions:'>
-      <arg name='options' declared_type='NSPointerFunctionsOptions' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='hashTableWithWeakObjects'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithOptions:capacity:'>
-      <arg name='options' declared_type='NSPointerFunctionsOptions' type='I' type64='Q' index='0'/>
-      <arg name='initialCapacity' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithPointerFunctions:capacity:'>
-      <arg name='functions' declared_type='NSPointerFunctions*' type='@' index='0'/>
-      <arg name='initialCapacity' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='intersectHashTable:'>
-      <arg name='other' declared_type='NSHashTable*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='intersectsHashTable:'>
-      <arg name='other' declared_type='NSHashTable*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEqualToHashTable:'>
-      <arg name='other' declared_type='NSHashTable*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSubsetOfHashTable:'>
-      <arg name='other' declared_type='NSHashTable*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='member:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='minusHashTable:'>
-      <arg name='other' declared_type='NSHashTable*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='objectEnumerator'>
-      <retval declared_type='NSEnumerator*' type='@'/>
-    </method>
-    <method selector='pointerFunctions'>
-      <retval declared_type='NSPointerFunctions*' type='@'/>
-    </method>
-    <method selector='removeAllObjects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRepresentation'>
-      <retval declared_type='NSSet*' type='@'/>
-    </method>
-    <method selector='unionHashTable:'>
-      <arg name='other' declared_type='NSHashTable*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSHost'>
-    <method selector='address'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='addresses'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='currentHost'>
-      <retval declared_type='NSHost*' type='@'/>
-    </method>
-    <method class_method='true' selector='flushHostCache'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='hostWithAddress:'>
-      <arg name='address' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSHost*' type='@'/>
-    </method>
-    <method class_method='true' selector='hostWithName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSHost*' type='@'/>
-    </method>
-    <method selector='isEqualToHost:'>
-      <arg name='aHost' declared_type='NSHost*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='isHostCacheEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='names'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='setHostCacheEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSIndexPath'>
-    <method selector='compare:'>
-      <arg name='otherObject' declared_type='NSIndexPath*' type='@' index='0'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method selector='getIndexes:'>
-      <arg name='indexes' declared_type='NSUInteger*' type='^I' type64='^Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='indexAtPosition:'>
-      <arg name='position' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='indexPathByAddingIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSIndexPath*' type='@'/>
-    </method>
-    <method selector='indexPathByRemovingLastIndex'>
-      <retval declared_type='NSIndexPath*' type='@'/>
-    </method>
-    <method class_method='true' selector='indexPathWithIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='indexPathWithIndexes:length:'>
-      <arg name='indexes' declared_type='NSUInteger*' type='^I' type64='^Q' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithIndexes:length:'>
-      <arg name='indexes' declared_type='NSUInteger*' type='^I' type64='^Q' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-  </class>
-  <class name='NSIndexSet'>
-    <method selector='containsIndex:'>
-      <arg name='value' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='containsIndexes:'>
-      <arg name='indexSet' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='containsIndexesInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='count'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='countOfIndexesInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='firstIndex'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='getIndexes:maxCount:inIndexRange:'>
-      <arg name='indexBuffer' declared_type='NSUInteger*' type='^I' type64='^Q' index='0'/>
-      <arg name='bufferSize' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='range' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='indexGreaterThanIndex:'>
-      <arg name='value' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='indexGreaterThanOrEqualToIndex:'>
-      <arg name='value' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='indexLessThanIndex:'>
-      <arg name='value' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='indexLessThanOrEqualToIndex:'>
-      <arg name='value' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='indexSet'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='indexSetWithIndex:'>
-      <arg name='value' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='indexSetWithIndexesInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithIndex:'>
-      <arg name='value' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithIndexSet:'>
-      <arg name='indexSet' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithIndexesInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='intersectsIndexesInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEqualToIndexSet:'>
-      <arg name='indexSet' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='lastIndex'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-  </class>
-  <class name='NSIndexSpecifier'>
-    <method selector='index'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='initWithContainerClassDescription:containerSpecifier:key:index:'>
-      <arg name='classDesc' declared_type='NSScriptClassDescription*' type='@' index='0'/>
-      <arg name='container' declared_type='NSScriptObjectSpecifier*' type='@' index='1'/>
-      <arg name='property' declared_type='NSString*' type='@' index='2'/>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSInputStream'>
-    <method ignore='true' selector='getBuffer:length:'>
-      <arg name='buffer' declared_type='uint8_t**' type='^*' index='0'/>
-      <arg name='len' declared_type='NSUInteger*' type='^I' type64='^Q' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasBytesAvailable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithFileAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='inputStreamWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='inputStreamWithFileAtPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='read:maxLength:'>
-      <arg name='buffer' declared_type='uint8_t*' type='*' index='0'/>
-      <arg name='len' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-  </class>
-  <class name='NSInvocation'>
-    <method selector='argumentsRetained'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='getArgument:atIndex:'>
-      <arg name='argumentLocation' declared_type='void*' type='^v' index='0'/>
-      <arg name='idx' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getReturnValue:'>
-      <arg name='retLoc' declared_type='void*' type='^v' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='invocationWithMethodSignature:'>
-      <arg name='sig' declared_type='NSMethodSignature*' type='@' index='0'/>
-      <retval declared_type='NSInvocation*' type='@'/>
-    </method>
-    <method selector='invoke'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='invokeWithTarget:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='methodSignature'>
-      <retval declared_type='NSMethodSignature*' type='@'/>
-    </method>
-    <method selector='retainArguments'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selector'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='setArgument:atIndex:'>
-      <arg name='argumentLocation' declared_type='void*' type='^v' index='0'/>
-      <arg name='idx' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setReturnValue:'>
-      <arg name='retLoc' declared_type='void*' type='^v' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelector:'>
-      <arg name='selector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTarget:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='target'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSInvocationOperation'>
-    <method selector='initWithInvocation:'>
-      <arg name='inv' declared_type='NSInvocation*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithTarget:selector:object:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <arg name='sel' declared_type='SEL' type=':' index='1'/>
-      <arg name='arg' declared_type='id' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='invocation'>
-      <retval declared_type='NSInvocation*' type='@'/>
-    </method>
-    <method selector='result'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSKeyedArchiver'>
-    <method class_method='true' selector='archiveRootObject:toFile:'>
-      <arg name='rootObject' declared_type='id' type='@' index='0'/>
-      <arg name='path' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='archivedDataWithRootObject:'>
-      <arg name='rootObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='classNameForClass:'>
-      <arg name='cls' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='classNameForClass:'>
-      <arg name='cls' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='encodeBool:forKey:'>
-      <arg name='boolv' declared_type='BOOL' type='B' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeBytes:length:forKey:'>
-      <arg name='bytesp' declared_type='uint8_t*' type='*' const='true' index='0'/>
-      <arg name='lenv' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='key' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeConditionalObject:forKey:'>
-      <arg name='objv' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeDouble:forKey:'>
-      <arg name='realv' declared_type='double' type='d' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeFloat:forKey:'>
-      <arg name='realv' declared_type='float' type='f' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeInt32:forKey:'>
-      <arg name='intv' declared_type='int32_t' type='i' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeInt64:forKey:'>
-      <arg name='intv' declared_type='int64_t' type='q' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeInt:forKey:'>
-      <arg name='intv' declared_type='int' type='i' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeObject:forKey:'>
-      <arg name='objv' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='finishEncoding'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initForWritingWithMutableData:'>
-      <arg name='data' declared_type='NSMutableData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='outputFormat'>
-      <retval declared_type='NSPropertyListFormat' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='setClassName:forClass:'>
-      <arg name='codedName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='cls' declared_type='Class' type='#' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setClassName:forClass:'>
-      <arg name='codedName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='cls' declared_type='Class' type='#' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOutputFormat:'>
-      <arg name='format' declared_type='NSPropertyListFormat' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSKeyedUnarchiver'>
-    <method selector='classForClassName:'>
-      <arg name='codedName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method class_method='true' selector='classForClassName:'>
-      <arg name='codedName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='containsValueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='decodeBoolForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='decodeBytesForKey:returnedLength:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='lengthp' declared_type='NSUInteger*' type='^I' type64='^Q' index='1'/>
-      <retval declared_type='uint8_t*' type='*' const='true'/>
-    </method>
-    <method selector='decodeDoubleForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='decodeFloatForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='decodeInt32ForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='int32_t' type='i'/>
-    </method>
-    <method selector='decodeInt64ForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='int64_t' type='q'/>
-    </method>
-    <method selector='decodeIntForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='decodeObjectForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='finishDecoding'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initForReadingWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setClass:forClassName:'>
-      <arg name='cls' declared_type='Class' type='#' index='0'/>
-      <arg name='codedName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setClass:forClassName:'>
-      <arg name='cls' declared_type='Class' type='#' index='0'/>
-      <arg name='codedName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='unarchiveObjectWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='unarchiveObjectWithFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSLocale'>
-    <method class_method='true' selector='ISOCountryCodes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='ISOCurrencyCodes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='ISOLanguageCodes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='autoupdatingCurrentLocale'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='availableLocaleIdentifiers'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='canonicalLocaleIdentifierFromString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='commonISOCurrencyCodes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='componentsFromLocaleIdentifier:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method class_method='true' selector='currentLocale'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='displayNameForKey:value:'>
-      <arg name='key' declared_type='id' type='@' index='0'/>
-      <arg name='value' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='initWithLocaleIdentifier:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='localeIdentifier'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='localeIdentifierFromComponents:'>
-      <arg name='dict' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='objectForKey:'>
-      <arg name='key' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='preferredLanguages'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='systemLocale'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSLock'>
-    <method selector='lockBeforeDate:'>
-      <arg name='limit' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setName:'>
-      <arg name='n' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tryLock'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSLogicalTest'>
-    <method selector='initAndTestWithTests:'>
-      <arg name='subTests' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initNotTestWithTest:'>
-      <arg name='subTest' declared_type='NSScriptWhoseTest*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initOrTestWithTests:'>
-      <arg name='subTests' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSMachBootstrapServer'>
-    <method selector='portForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='portForName:host:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='host' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='registerPort:name:'>
-      <arg name='port' declared_type='NSPort*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='servicePortWithName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method class_method='true' selector='sharedInstance'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSMachPort'>
-    <method selector='initWithMachPort:'>
-      <arg name='machPort' declared_type='uint32_t' type='I' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithMachPort:options:'>
-      <arg name='machPort' declared_type='uint32_t' type='I' index='0'/>
-      <arg name='f' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='machPort'>
-      <retval declared_type='uint32_t' type='I'/>
-    </method>
-    <method class_method='true' selector='portWithMachPort:'>
-      <arg name='machPort' declared_type='uint32_t' type='I' index='0'/>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method class_method='true' selector='portWithMachPort:options:'>
-      <arg name='machPort' declared_type='uint32_t' type='I' index='0'/>
-      <arg name='f' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='removeFromRunLoop:forMode:'>
-      <arg name='runLoop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scheduleInRunLoop:forMode:'>
-      <arg name='runLoop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSMapTable'>
-    <method selector='count'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='dictionaryRepresentation'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='initWithKeyOptions:valueOptions:capacity:'>
-      <arg name='keyOptions' declared_type='NSPointerFunctionsOptions' type='I' type64='Q' index='0'/>
-      <arg name='valueOptions' declared_type='NSPointerFunctionsOptions' type='I' type64='Q' index='1'/>
-      <arg name='initialCapacity' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithKeyPointerFunctions:valuePointerFunctions:capacity:'>
-      <arg name='keyFunctions' declared_type='NSPointerFunctions*' type='@' index='0'/>
-      <arg name='valueFunctions' declared_type='NSPointerFunctions*' type='@' index='1'/>
-      <arg name='initialCapacity' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='keyEnumerator'>
-      <retval declared_type='NSEnumerator*' type='@'/>
-    </method>
-    <method selector='keyPointerFunctions'>
-      <retval declared_type='NSPointerFunctions*' type='@'/>
-    </method>
-    <method class_method='true' selector='mapTableWithKeyOptions:valueOptions:'>
-      <arg name='keyOptions' declared_type='NSPointerFunctionsOptions' type='I' type64='Q' index='0'/>
-      <arg name='valueOptions' declared_type='NSPointerFunctionsOptions' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='mapTableWithStrongToStrongObjects'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='mapTableWithStrongToWeakObjects'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='mapTableWithWeakToStrongObjects'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='mapTableWithWeakToWeakObjects'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectEnumerator'>
-      <retval declared_type='NSEnumerator*' type='@'/>
-    </method>
-    <method selector='objectForKey:'>
-      <arg name='aKey' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='removeAllObjects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectForKey:'>
-      <arg name='aKey' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObject:forKey:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <arg name='aKey' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='valuePointerFunctions'>
-      <retval declared_type='NSPointerFunctions*' type='@'/>
-    </method>
-  </class>
-  <class name='NSMessagePortNameServer'>
-    <method selector='portForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='portForName:host:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='host' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method class_method='true' selector='sharedInstance'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSMetadataItem'>
-    <method selector='attributes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='valueForAttribute:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='valuesForAttributes:'>
-      <arg name='keys' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-  </class>
-  <class name='NSMetadataQuery'>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='disableUpdates'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='enableUpdates'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='groupedResults'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='groupingAttributes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='indexOfResult:'>
-      <arg name='result' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isGathering'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isStarted'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isStopped'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='notificationBatchingInterval'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='predicate'>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method selector='resultAtIndex:'>
-      <arg name='idx' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='resultCount'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='results'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='searchScopes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGroupingAttributes:'>
-      <arg name='attrs' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNotificationBatchingInterval:'>
-      <arg name='ti' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPredicate:'>
-      <arg name='predicate' declared_type='NSPredicate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSearchScopes:'>
-      <arg name='scopes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSortDescriptors:'>
-      <arg name='descriptors' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValueListAttributes:'>
-      <arg name='attrs' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sortDescriptors'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='startQuery'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='stopQuery'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='valueListAttributes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='valueLists'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='valueOfAttribute:forResultAtIndex:'>
-      <arg name='attrName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='idx' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSMetadataQueryAttributeValueTuple'>
-    <method selector='attribute'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='count'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='value'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSMetadataQueryResultGroup'>
-    <method selector='attribute'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='resultAtIndex:'>
-      <arg name='idx' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='resultCount'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='results'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='subgroups'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='value'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSMethodSignature'>
-    <method selector='frameLength'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='getArgumentTypeAtIndex:'>
-      <arg name='idx' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='char*' type='*' const='true'/>
-    </method>
-    <method selector='isOneway'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='methodReturnLength'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='methodReturnType'>
-      <retval declared_type='char*' type='*' const='true'/>
-    </method>
-    <method selector='numberOfArguments'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='signatureWithObjCTypes:'>
-      <arg name='types' declared_type='char*' type='*' const='true' index='0'/>
-      <retval declared_type='NSMethodSignature*' type='@'/>
-    </method>
-  </class>
-  <class name='NSMoveCommand'>
-    <method selector='keySpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='setReceiversSpecifier:'>
-      <arg name='receiversRef' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSMutableArray'>
-    <method selector='addObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addObjectsFromArray:'>
-      <arg name='otherArray' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='arrayWithCapacity:'>
-      <arg name='numItems' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='exchangeObjectAtIndex:withObjectAtIndex:'>
-      <arg name='idx1' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='idx2' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='filterUsingPredicate:'>
-      <arg name='predicate' declared_type='NSPredicate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithCapacity:'>
-      <arg name='numItems' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertObject:atIndex:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertObjects:atIndexes:'>
-      <arg name='objects' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAllObjects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeLastObject'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObject:inRange:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectAtIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectIdenticalTo:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectIdenticalTo:inRange:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectsAtIndexes:'>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectsFromIndices:numIndices:'>
-      <arg name='indices' declared_type='NSUInteger*' type='^I' type64='^Q' index='0'/>
-      <arg name='cnt' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectsInArray:'>
-      <arg name='otherArray' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectsInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceObjectAtIndex:withObject:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceObjectsAtIndexes:withObjects:'>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='0'/>
-      <arg name='objects' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceObjectsInRange:withObjectsFromArray:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='otherArray' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceObjectsInRange:withObjectsFromArray:range:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='otherArray' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='otherRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setArray:'>
-      <arg name='otherArray' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sortUsingDescriptors:'>
-      <arg name='sortDescriptors' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sortUsingFunction:context:'>
-      <arg name='compare' function_pointer='true' declared_type='NSInteger *id, id, void*' type='^?' index='0' type_modifier='n'>
-        <arg declared_type='id' type='@'/>
-        <arg declared_type='id' type='@'/>
-        <arg declared_type='void*' type='^v'/>
-        <retval declared_type='NSInteger' type='i' type64='q'/>
-      </arg>
-      <arg name='context' declared_type='void*' type='^v' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sortUsingSelector:'>
-      <arg name='comparator' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSMutableAttributedString'>
-    <method selector='addAttribute:value:range:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='value' declared_type='id' type='@' index='1'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addAttributes:range:'>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendAttributedString:'>
-      <arg name='attrString' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='beginEditing'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteCharactersInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='endEditing'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertAttributedString:atIndex:'>
-      <arg name='attrString' declared_type='NSAttributedString*' type='@' index='0'/>
-      <arg name='loc' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='mutableString'>
-      <retval declared_type='NSMutableString*' type='@'/>
-    </method>
-    <method selector='removeAttribute:range:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceCharactersInRange:withAttributedString:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='attrString' declared_type='NSAttributedString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceCharactersInRange:withString:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='str' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedString:'>
-      <arg name='attrString' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributes:range:'>
-      <arg name='attrs' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSMutableCharacterSet'>
-    <method selector='addCharactersInRange:'>
-      <arg name='aRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addCharactersInString:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='formIntersectionWithCharacterSet:'>
-      <arg name='otherSet' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='formUnionWithCharacterSet:'>
-      <arg name='otherSet' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='invert'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeCharactersInRange:'>
-      <arg name='aRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeCharactersInString:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSMutableData'>
-    <method selector='appendBytes:length:'>
-      <arg name='bytes' declared_type='void*' type='^v' const='true' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendData:'>
-      <arg name='other' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='dataWithCapacity:'>
-      <arg name='aNumItems' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dataWithLength:'>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='increaseLengthBy:'>
-      <arg name='extraLength' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithCapacity:'>
-      <arg name='capacity' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithLength:'>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='mutableBytes'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='replaceBytesInRange:withBytes:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='bytes' declared_type='void*' type='^v' const='true' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceBytesInRange:withBytes:length:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='replacementBytes' declared_type='void*' type='^v' const='true' index='1'/>
-      <arg name='replacementLength' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resetBytesInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLength:'>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSMutableDictionary'>
-    <method selector='addEntriesFromDictionary:'>
-      <arg name='otherDictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='dictionaryWithCapacity:'>
-      <arg name='numItems' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithCapacity:'>
-      <arg name='numItems' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='removeAllObjects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectForKey:'>
-      <arg name='aKey' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectsForKeys:'>
-      <arg name='keyArray' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDictionary:'>
-      <arg name='otherDictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObject:forKey:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <arg name='aKey' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValue:forKey:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSMutableIndexSet'>
-    <method selector='addIndex:'>
-      <arg name='value' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addIndexes:'>
-      <arg name='indexSet' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addIndexesInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAllIndexes'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeIndex:'>
-      <arg name='value' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeIndexes:'>
-      <arg name='indexSet' declared_type='NSIndexSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeIndexesInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shiftIndexesStartingAtIndex:by:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='delta' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSMutableSet'>
-    <method selector='addObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addObjectsFromArray:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='filterUsingPredicate:'>
-      <arg name='predicate' declared_type='NSPredicate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithCapacity:'>
-      <arg name='numItems' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='intersectSet:'>
-      <arg name='otherSet' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='minusSet:'>
-      <arg name='otherSet' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAllObjects'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSet:'>
-      <arg name='otherSet' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setWithCapacity:'>
-      <arg name='numItems' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='unionSet:'>
-      <arg name='otherSet' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSMutableString'>
-    <method variadic='true' selector='appendFormat:'>
-      <arg name='appendFormat' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='appendString:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteCharactersInRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithCapacity:'>
-      <arg name='capacity' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertString:atIndex:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='loc' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceCharactersInRange:withString:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='aString' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceOccurrencesOfString:withString:options:range:'>
-      <arg name='target' declared_type='NSString*' type='@' index='0'/>
-      <arg name='replacement' declared_type='NSString*' type='@' index='1'/>
-      <arg name='options' declared_type='NSStringCompareOptions' type='I' type64='Q' index='2'/>
-      <arg name='searchRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='setString:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='stringWithCapacity:'>
-      <arg name='capacity' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSMutableURLRequest'>
-    <method selector='addValue:forHTTPHeaderField:'>
-      <arg name='value' declared_type='NSString*' type='@' index='0'/>
-      <arg name='field' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllHTTPHeaderFields:'>
-      <arg name='headerFields' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCachePolicy:'>
-      <arg name='policy' declared_type='NSURLRequestCachePolicy' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHTTPBody:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHTTPBodyStream:'>
-      <arg name='inputStream' declared_type='NSInputStream*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHTTPMethod:'>
-      <arg name='method' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHTTPShouldHandleCookies:'>
-      <arg name='should' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMainDocumentURL:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTimeoutInterval:'>
-      <arg name='seconds' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setURL:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValue:forHTTPHeaderField:'>
-      <arg name='value' declared_type='NSString*' type='@' index='0'/>
-      <arg name='field' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSNameSpecifier'>
-    <method selector='initWithContainerClassDescription:containerSpecifier:key:name:'>
-      <arg name='classDesc' declared_type='NSScriptClassDescription*' type='@' index='0'/>
-      <arg name='container' declared_type='NSScriptObjectSpecifier*' type='@' index='1'/>
-      <arg name='property' declared_type='NSString*' type='@' index='2'/>
-      <arg name='name' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSNetService'>
-    <method selector='TXTRecordData'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='addresses'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='dataFromTXTRecordDictionary:'>
-      <arg name='txtDictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='dictionaryFromTXTRecordData:'>
-      <arg name='txtData' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='domain'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='getInputStream:outputStream:'>
-      <arg name='inputStream' declared_type='NSInputStream**' type='^@' index='0'/>
-      <arg name='outputStream' declared_type='NSOutputStream**' type='^@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hostName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='initWithDomain:type:name:'>
-      <arg name='domain' declared_type='NSString*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <arg name='name' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithDomain:type:name:port:'>
-      <arg name='domain' declared_type='NSString*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <arg name='name' declared_type='NSString*' type='@' index='2'/>
-      <arg name='port' declared_type='int' type='i' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='port'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='protocolSpecificInformation'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='publish'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='publishWithOptions:'>
-      <arg name='options' declared_type='NSNetServiceOptions' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeFromRunLoop:forMode:'>
-      <arg name='aRunLoop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resolve'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resolveWithTimeout:'>
-      <arg name='timeout' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scheduleInRunLoop:forMode:'>
-      <arg name='aRunLoop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setProtocolSpecificInformation:'>
-      <arg name='specificInformation' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTXTRecordData:'>
-      <arg name='recordData' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='startMonitoring'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stop'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopMonitoring'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='type'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSNetServiceBrowser'>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='removeFromRunLoop:forMode:'>
-      <arg name='aRunLoop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scheduleInRunLoop:forMode:'>
-      <arg name='aRunLoop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='searchForAllDomains'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='searchForBrowsableDomains'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='searchForRegistrationDomains'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='searchForServicesOfType:inDomain:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <arg name='domainString' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stop'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSNotification'>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='notificationWithName:object:'>
-      <arg name='aName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='notificationWithName:object:userInfo:'>
-      <arg name='aName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <arg name='aUserInfo' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='object'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='userInfo'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-  </class>
-  <class name='NSNotificationCenter'>
-    <method selector='addObserver:selector:name:object:'>
-      <arg name='observer' declared_type='id' type='@' index='0'/>
-      <arg name='aSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='aName' declared_type='NSString*' type='@' index='2'/>
-      <arg name='anObject' declared_type='id' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='defaultCenter'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='postNotification:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='postNotificationName:object:'>
-      <arg name='aName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='postNotificationName:object:userInfo:'>
-      <arg name='aName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='anObject' declared_type='id' type='@' index='1'/>
-      <arg name='aUserInfo' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObserver:'>
-      <arg name='observer' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObserver:name:object:'>
-      <arg name='observer' declared_type='id' type='@' index='0'/>
-      <arg name='aName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='anObject' declared_type='id' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSNotificationQueue'>
-    <method class_method='true' selector='defaultQueue'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='dequeueNotificationsMatching:coalesceMask:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <arg name='coalesceMask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='enqueueNotification:postingStyle:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <arg name='postingStyle' declared_type='NSPostingStyle' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='enqueueNotification:postingStyle:coalesceMask:forModes:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <arg name='postingStyle' declared_type='NSPostingStyle' type='I' type64='Q' index='1'/>
-      <arg name='coalesceMask' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <arg name='modes' declared_type='NSArray*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithNotificationCenter:'>
-      <arg name='notificationCenter' declared_type='NSNotificationCenter*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSNull'>
-    <method class_method='true' selector='null'>
-      <retval declared_type='NSNull*' type='@'/>
-    </method>
-  </class>
-  <class name='NSNumber'>
-    <method selector='boolValue'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='charValue'>
-      <retval declared_type='char' type='c'/>
-    </method>
-    <method selector='compare:'>
-      <arg name='otherNumber' declared_type='NSNumber*' type='@' index='0'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method selector='decimalValue'>
-      <retval declared_type='NSDecimal' type='{_NSDecimal=b8b4b1b1b18[8S]}'/>
-    </method>
-    <method selector='descriptionWithLocale:'>
-      <arg name='locale' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='doubleValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='floatValue'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='initWithBool:'>
-      <arg name='value' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithChar:'>
-      <arg name='value' declared_type='char' type='c' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithDouble:'>
-      <arg name='value' declared_type='double' type='d' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithFloat:'>
-      <arg name='value' declared_type='float' type='f' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithInt:'>
-      <arg name='value' declared_type='int' type='i' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithInteger:'>
-      <arg name='value' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithLong:'>
-      <arg name='value' declared_type='long' type='l' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithLongLong:'>
-      <arg name='value' declared_type='long long' type='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithShort:'>
-      <arg name='value' declared_type='short' type='s' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithUnsignedChar:'>
-      <arg name='value' declared_type='unsigned char' type='C' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithUnsignedInt:'>
-      <arg name='value' declared_type='unsigned int' type='I' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithUnsignedInteger:'>
-      <arg name='value' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithUnsignedLong:'>
-      <arg name='value' declared_type='unsigned long' type='L' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithUnsignedLongLong:'>
-      <arg name='value' declared_type='unsigned long long' type='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithUnsignedShort:'>
-      <arg name='value' declared_type='unsigned short' type='S' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='intValue'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='integerValue'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='isEqualToNumber:'>
-      <arg name='number' declared_type='NSNumber*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='longLongValue'>
-      <retval declared_type='long long' type='q'/>
-    </method>
-    <method selector='longValue'>
-      <retval declared_type='long' type='l' type64='q'/>
-    </method>
-    <method class_method='true' selector='numberWithBool:'>
-      <arg name='value' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithChar:'>
-      <arg name='value' declared_type='char' type='c' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithDouble:'>
-      <arg name='value' declared_type='double' type='d' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithFloat:'>
-      <arg name='value' declared_type='float' type='f' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithInt:'>
-      <arg name='value' declared_type='int' type='i' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithInteger:'>
-      <arg name='value' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithLong:'>
-      <arg name='value' declared_type='long' type='l' type64='q' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithLongLong:'>
-      <arg name='value' declared_type='long long' type='q' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithShort:'>
-      <arg name='value' declared_type='short' type='s' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithUnsignedChar:'>
-      <arg name='value' declared_type='unsigned char' type='C' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithUnsignedInt:'>
-      <arg name='value' declared_type='unsigned int' type='I' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithUnsignedInteger:'>
-      <arg name='value' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithUnsignedLong:'>
-      <arg name='value' declared_type='unsigned long' type='L' type64='Q' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithUnsignedLongLong:'>
-      <arg name='value' declared_type='unsigned long long' type='Q' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method class_method='true' selector='numberWithUnsignedShort:'>
-      <arg name='value' declared_type='unsigned short' type='S' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method selector='shortValue'>
-      <retval declared_type='short' type='s'/>
-    </method>
-    <method selector='stringValue'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='unsignedCharValue'>
-      <retval declared_type='unsigned char' type='C'/>
-    </method>
-    <method selector='unsignedIntValue'>
-      <retval declared_type='unsigned int' type='I'/>
-    </method>
-    <method selector='unsignedIntegerValue'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='unsignedLongLongValue'>
-      <retval declared_type='unsigned long long' type='Q'/>
-    </method>
-    <method selector='unsignedLongValue'>
-      <retval declared_type='unsigned long' type='L' type64='Q'/>
-    </method>
-    <method selector='unsignedShortValue'>
-      <retval declared_type='unsigned short' type='S'/>
-    </method>
-  </class>
-  <class name='NSNumberFormatter'>
-    <method selector='allowsFloats'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='alwaysShowsDecimalSeparator'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='attributedStringForNil'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='attributedStringForNotANumber'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='attributedStringForZero'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='currencyCode'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='currencyDecimalSeparator'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='currencyGroupingSeparator'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='currencySymbol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='decimalSeparator'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='defaultFormatterBehavior'>
-      <retval declared_type='NSNumberFormatterBehavior' type='I' type64='Q'/>
-    </method>
-    <method selector='exponentSymbol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='format'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='formatWidth'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='formatterBehavior'>
-      <retval declared_type='NSNumberFormatterBehavior' type='I' type64='Q'/>
-    </method>
-    <method selector='generatesDecimalNumbers'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='getObjectValue:forString:range:error:'>
-      <arg name='obj' declared_type='out id*' type='^@' index='0'/>
-      <arg name='string' declared_type='NSString*' type='@' index='1'/>
-      <arg name='rangep' declared_type='inout NSRange*' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='2'/>
-      <arg name='error' declared_type='out NSError**' type='^@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='groupingSeparator'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='groupingSize'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='hasThousandSeparators'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='internationalCurrencySymbol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='isLenient'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isPartialStringValidationEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='locale'>
-      <retval declared_type='NSLocale*' type='@'/>
-    </method>
-    <method selector='localizesFormat'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='maximum'>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method selector='maximumFractionDigits'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='maximumIntegerDigits'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='maximumSignificantDigits'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='minimum'>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method selector='minimumFractionDigits'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='minimumIntegerDigits'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='minimumSignificantDigits'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='minusSign'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='multiplier'>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method selector='negativeFormat'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='negativeInfinitySymbol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='negativePrefix'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='negativeSuffix'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='nilSymbol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='notANumberSymbol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='numberFromString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method selector='numberStyle'>
-      <retval declared_type='NSNumberFormatterStyle' type='I' type64='Q'/>
-    </method>
-    <method selector='paddingCharacter'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='paddingPosition'>
-      <retval declared_type='NSNumberFormatterPadPosition' type='I' type64='Q'/>
-    </method>
-    <method selector='perMillSymbol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='percentSymbol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='plusSign'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='positiveFormat'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='positiveInfinitySymbol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='positivePrefix'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='positiveSuffix'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='roundingBehavior'>
-      <retval declared_type='NSDecimalNumberHandler*' type='@'/>
-    </method>
-    <method selector='roundingIncrement'>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method selector='roundingMode'>
-      <retval declared_type='NSNumberFormatterRoundingMode' type='I' type64='Q'/>
-    </method>
-    <method selector='secondaryGroupingSize'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='setAllowsFloats:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAlwaysShowsDecimalSeparator:'>
-      <arg name='b' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedStringForNil:'>
-      <arg name='newAttributedString' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedStringForNotANumber:'>
-      <arg name='newAttributedString' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributedStringForZero:'>
-      <arg name='newAttributedString' declared_type='NSAttributedString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCurrencyCode:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCurrencyDecimalSeparator:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCurrencyGroupingSeparator:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCurrencySymbol:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDecimalSeparator:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setDefaultFormatterBehavior:'>
-      <arg name='behavior' declared_type='NSNumberFormatterBehavior' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setExponentSymbol:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFormat:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFormatWidth:'>
-      <arg name='number' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFormatterBehavior:'>
-      <arg name='behavior' declared_type='NSNumberFormatterBehavior' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGeneratesDecimalNumbers:'>
-      <arg name='b' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGroupingSeparator:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGroupingSize:'>
-      <arg name='number' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHasThousandSeparators:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setInternationalCurrencySymbol:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLenient:'>
-      <arg name='b' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocale:'>
-      <arg name='locale' declared_type='NSLocale*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocalizesFormat:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaximum:'>
-      <arg name='number' declared_type='NSNumber*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaximumFractionDigits:'>
-      <arg name='number' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaximumIntegerDigits:'>
-      <arg name='number' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaximumSignificantDigits:'>
-      <arg name='number' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinimum:'>
-      <arg name='number' declared_type='NSNumber*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinimumFractionDigits:'>
-      <arg name='number' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinimumIntegerDigits:'>
-      <arg name='number' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinimumSignificantDigits:'>
-      <arg name='number' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinusSign:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMultiplier:'>
-      <arg name='number' declared_type='NSNumber*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNegativeFormat:'>
-      <arg name='format' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNegativeInfinitySymbol:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNegativePrefix:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNegativeSuffix:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNilSymbol:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNotANumberSymbol:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNumberStyle:'>
-      <arg name='style' declared_type='NSNumberFormatterStyle' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPaddingCharacter:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPaddingPosition:'>
-      <arg name='position' declared_type='NSNumberFormatterPadPosition' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPartialStringValidationEnabled:'>
-      <arg name='b' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPerMillSymbol:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPercentSymbol:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPlusSign:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPositiveFormat:'>
-      <arg name='format' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPositiveInfinitySymbol:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPositivePrefix:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPositiveSuffix:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRoundingBehavior:'>
-      <arg name='newRoundingBehavior' declared_type='NSDecimalNumberHandler*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRoundingIncrement:'>
-      <arg name='number' declared_type='NSNumber*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRoundingMode:'>
-      <arg name='mode' declared_type='NSNumberFormatterRoundingMode' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSecondaryGroupingSize:'>
-      <arg name='number' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextAttributesForNegativeInfinity:'>
-      <arg name='newAttributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextAttributesForNegativeValues:'>
-      <arg name='newAttributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextAttributesForNil:'>
-      <arg name='newAttributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextAttributesForNotANumber:'>
-      <arg name='newAttributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextAttributesForPositiveInfinity:'>
-      <arg name='newAttributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextAttributesForPositiveValues:'>
-      <arg name='newAttributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextAttributesForZero:'>
-      <arg name='newAttributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setThousandSeparator:'>
-      <arg name='newSeparator' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesGroupingSeparator:'>
-      <arg name='b' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesSignificantDigits:'>
-      <arg name='b' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setZeroSymbol:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stringFromNumber:'>
-      <arg name='number' declared_type='NSNumber*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='textAttributesForNegativeInfinity'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='textAttributesForNegativeValues'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='textAttributesForNil'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='textAttributesForNotANumber'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='textAttributesForPositiveInfinity'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='textAttributesForPositiveValues'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='textAttributesForZero'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='thousandSeparator'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='usesGroupingSeparator'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='usesSignificantDigits'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='zeroSymbol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSObject'>
-    <method selector='URL:resourceDataDidBecomeAvailable:'>
-      <arg name='sender' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='newBytes' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URL:resourceDidFailLoadingWithReason:'>
-      <arg name='sender' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='reason' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLHandle:resourceDataDidBecomeAvailable:'>
-      <arg name='sender' declared_type='NSURLHandle*' type='@' index='0'/>
-      <arg name='newBytes' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLHandle:resourceDidFailLoadingWithReason:'>
-      <arg name='sender' declared_type='NSURLHandle*' type='@' index='0'/>
-      <arg name='reason' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLHandleResourceDidBeginLoading:'>
-      <arg name='sender' declared_type='NSURLHandle*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLHandleResourceDidCancelLoading:'>
-      <arg name='sender' declared_type='NSURLHandle*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLHandleResourceDidFinishLoading:'>
-      <arg name='sender' declared_type='NSURLHandle*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLProtocol:cachedResponseIsValid:'>
-      <arg name='protocol' declared_type='NSURLProtocol*' type='@' index='0'/>
-      <arg name='cachedResponse' declared_type='NSCachedURLResponse*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLProtocol:didCancelAuthenticationChallenge:'>
-      <arg name='protocol' declared_type='NSURLProtocol*' type='@' index='0'/>
-      <arg name='challenge' declared_type='NSURLAuthenticationChallenge*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLProtocol:didFailWithError:'>
-      <arg name='protocol' declared_type='NSURLProtocol*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLProtocol:didLoadData:'>
-      <arg name='protocol' declared_type='NSURLProtocol*' type='@' index='0'/>
-      <arg name='data' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLProtocol:didReceiveAuthenticationChallenge:'>
-      <arg name='protocol' declared_type='NSURLProtocol*' type='@' index='0'/>
-      <arg name='challenge' declared_type='NSURLAuthenticationChallenge*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLProtocol:didReceiveResponse:cacheStoragePolicy:'>
-      <arg name='protocol' declared_type='NSURLProtocol*' type='@' index='0'/>
-      <arg name='response' declared_type='NSURLResponse*' type='@' index='1'/>
-      <arg name='policy' declared_type='NSURLCacheStoragePolicy' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLProtocol:wasRedirectedToRequest:redirectResponse:'>
-      <arg name='protocol' declared_type='NSURLProtocol*' type='@' index='0'/>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='1'/>
-      <arg name='redirectResponse' declared_type='NSURLResponse*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLProtocolDidFinishLoading:'>
-      <arg name='protocol' declared_type='NSURLProtocol*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLResourceDidCancelLoading:'>
-      <arg name='sender' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='URLResourceDidFinishLoading:'>
-      <arg name='sender' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='accessInstanceVariablesDirectly'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='addObserver:forKeyPath:options:context:'>
-      <arg name='observer' declared_type='NSObject*' type='@' index='0'/>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='options' declared_type='NSKeyValueObservingOptions' type='I' type64='Q' index='2'/>
-      <arg name='context' declared_type='void*' type='^v' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='alloc'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='allocWithZone:'>
-      <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='archiver:didEncodeObject:'>
-      <arg name='archiver' declared_type='NSKeyedArchiver*' type='@' index='0'/>
-      <arg name='object' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='archiver:willEncodeObject:'>
-      <arg name='archiver' declared_type='NSKeyedArchiver*' type='@' index='0'/>
-      <arg name='object' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='archiver:willReplaceObject:withObject:'>
-      <arg name='archiver' declared_type='NSKeyedArchiver*' type='@' index='0'/>
-      <arg name='object' declared_type='id' type='@' index='1'/>
-      <arg name='newObject' declared_type='id' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='archiverDidFinish:'>
-      <arg name='archiver' declared_type='NSKeyedArchiver*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='archiverWillFinish:'>
-      <arg name='archiver' declared_type='NSKeyedArchiver*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='attemptRecoveryFromError:optionIndex:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <arg name='recoveryOptionIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <arg name='recoveryOptionIndex' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='delegate' declared_type='id' type='@' index='2'/>
-      <arg name='didRecoverSelector' declared_type='SEL' type=':' index='3'/>
-      <arg name='contextInfo' declared_type='void*' type='^v' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='attributeKeys'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='authenticateComponents:withData:'>
-      <arg name='components' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='signature' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='authenticationDataForComponents:'>
-      <arg name='components' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method class_method='true' selector='automaticallyNotifiesObserversForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='autorelease'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='awakeAfterUsingCoder:'>
-      <arg name='aDecoder' declared_type='NSCoder*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='cancelAuthenticationChallenge:'>
-      <arg name='challenge' declared_type='NSURLAuthenticationChallenge*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='cancelPreviousPerformRequestsWithTarget:'>
-      <arg name='aTarget' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='cancelPreviousPerformRequestsWithTarget:selector:object:'>
-      <arg name='aTarget' declared_type='id' type='@' index='0'/>
-      <arg name='aSelector' declared_type='SEL' type=':' index='1'/>
-      <arg name='anArgument' declared_type='id' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='class'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='class'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='classCode'>
-      <retval declared_type='FourCharCode' type='L' type64='I'/>
-    </method>
-    <method selector='classDescription'>
-      <retval declared_type='NSClassDescription*' type='@'/>
-    </method>
-    <method class_method='true' selector='classFallbacksForKeyedArchiver'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='classForArchiver'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='classForCoder'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='classForKeyedArchiver'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method class_method='true' selector='classForKeyedUnarchiver'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='classForPortCoder'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='className'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='coerceValue:forKey:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='conformsToProtocol:'>
-      <arg name='aProtocol' declared_type='Protocol*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='conformsToProtocol:'>
-      <arg name='protocol' declared_type='Protocol*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='connection:didCancelAuthenticationChallenge:'>
-      <arg name='connection' declared_type='NSURLConnection*' type='@' index='0'/>
-      <arg name='challenge' declared_type='NSURLAuthenticationChallenge*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='connection:didFailWithError:'>
-      <arg name='connection' declared_type='NSURLConnection*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='connection:didReceiveAuthenticationChallenge:'>
-      <arg name='connection' declared_type='NSURLConnection*' type='@' index='0'/>
-      <arg name='challenge' declared_type='NSURLAuthenticationChallenge*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='connection:didReceiveData:'>
-      <arg name='connection' declared_type='NSURLConnection*' type='@' index='0'/>
-      <arg name='data' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='connection:didReceiveResponse:'>
-      <arg name='connection' declared_type='NSURLConnection*' type='@' index='0'/>
-      <arg name='response' declared_type='NSURLResponse*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='connection:handleRequest:'>
-      <arg name='connection' declared_type='NSConnection*' type='@' index='0'/>
-      <arg name='doreq' declared_type='NSDistantObjectRequest*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='connection:shouldMakeNewConnection:'>
-      <arg name='ancestor' declared_type='NSConnection*' type='@' index='0'/>
-      <arg name='conn' declared_type='NSConnection*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='connection:willCacheResponse:'>
-      <arg name='connection' declared_type='NSURLConnection*' type='@' index='0'/>
-      <arg name='cachedResponse' declared_type='NSCachedURLResponse*' type='@' index='1'/>
-      <retval declared_type='NSCachedURLResponse*' type='@'/>
-    </method>
-    <method selector='connection:willSendRequest:redirectResponse:'>
-      <arg name='connection' declared_type='NSURLConnection*' type='@' index='0'/>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='1'/>
-      <arg name='response' declared_type='NSURLResponse*' type='@' index='2'/>
-      <retval declared_type='NSURLRequest*' type='@'/>
-    </method>
-    <method selector='connectionDidFinishLoading:'>
-      <arg name='connection' declared_type='NSURLConnection*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='continueWithoutCredentialForAuthenticationChallenge:'>
-      <arg name='challenge' declared_type='NSURLAuthenticationChallenge*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='copy'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='copyScriptingValue:forKey:withProperties:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <arg name='properties' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='copyWithZone:'>
-      <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='copyWithZone:'>
-      <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='countByEnumeratingWithState:objects:count:'>
-      <arg name='state' declared_type='NSFastEnumerationState*' type='^{_NSFastEnumerationState=L^@^L[5L]}' type64='^{_NSFastEnumerationState=Q^@^Q[5Q]}' index='0' type_modifier='n'/>
-      <arg name='stackbuf' declared_type='id*' type='^@' index='1'/>
-      <arg name='len' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='createConversationForConnection:'>
-      <arg name='conn' declared_type='NSConnection*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='dealloc'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='description'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='description'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='dictionaryWithValuesForKeys:'>
-      <arg name='keys' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='didChange:valuesAtIndexes:forKey:'>
-      <arg name='changeKind' declared_type='NSKeyValueChange' type='I' type64='Q' index='0'/>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='1'/>
-      <arg name='key' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='didChangeValueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='didChangeValueForKey:withSetMutation:usingObjects:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='mutationKind' declared_type='NSKeyValueSetMutationKind' type='I' type64='Q' index='1'/>
-      <arg name='objects' declared_type='NSSet*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='doesContain:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='doesNotRecognizeSelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='download:decideDestinationWithSuggestedFilename:'>
-      <arg name='download' declared_type='NSURLDownload*' type='@' index='0'/>
-      <arg name='filename' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='download:didCancelAuthenticationChallenge:'>
-      <arg name='download' declared_type='NSURLDownload*' type='@' index='0'/>
-      <arg name='challenge' declared_type='NSURLAuthenticationChallenge*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='download:didCreateDestination:'>
-      <arg name='download' declared_type='NSURLDownload*' type='@' index='0'/>
-      <arg name='path' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='download:didFailWithError:'>
-      <arg name='download' declared_type='NSURLDownload*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='download:didReceiveAuthenticationChallenge:'>
-      <arg name='download' declared_type='NSURLDownload*' type='@' index='0'/>
-      <arg name='challenge' declared_type='NSURLAuthenticationChallenge*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='download:didReceiveDataOfLength:'>
-      <arg name='download' declared_type='NSURLDownload*' type='@' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='download:didReceiveResponse:'>
-      <arg name='download' declared_type='NSURLDownload*' type='@' index='0'/>
-      <arg name='response' declared_type='NSURLResponse*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='download:shouldDecodeSourceDataOfMIMEType:'>
-      <arg name='download' declared_type='NSURLDownload*' type='@' index='0'/>
-      <arg name='encodingType' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='download:willResumeWithResponse:fromByte:'>
-      <arg name='download' declared_type='NSURLDownload*' type='@' index='0'/>
-      <arg name='response' declared_type='NSURLResponse*' type='@' index='1'/>
-      <arg name='startingByte' declared_type='long long' type='q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='download:willSendRequest:redirectResponse:'>
-      <arg name='download' declared_type='NSURLDownload*' type='@' index='0'/>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='1'/>
-      <arg name='redirectResponse' declared_type='NSURLResponse*' type='@' index='2'/>
-      <retval declared_type='NSURLRequest*' type='@'/>
-    </method>
-    <method selector='downloadDidBegin:'>
-      <arg name='download' declared_type='NSURLDownload*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='downloadDidFinish:'>
-      <arg name='download' declared_type='NSURLDownload*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodeWithCoder:'>
-      <arg name='aCoder' declared_type='NSCoder*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='exceptionDuringOperation:error:leftOperand:rightOperand:'>
-      <arg name='operation' declared_type='SEL' type=':' index='0'/>
-      <arg name='error' declared_type='NSCalculationError' type='I' type64='Q' index='1'/>
-      <arg name='leftOperand' declared_type='NSDecimalNumber*' type='@' index='2'/>
-      <arg name='rightOperand' declared_type='NSDecimalNumber*' type='@' index='3'/>
-      <retval declared_type='NSDecimalNumber*' type='@'/>
-    </method>
-    <method selector='fileManager:shouldCopyItemAtPath:toPath:'>
-      <arg name='fileManager' declared_type='NSFileManager*' type='@' index='0'/>
-      <arg name='srcPath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='dstPath' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileManager:shouldLinkItemAtPath:toPath:'>
-      <arg name='fileManager' declared_type='NSFileManager*' type='@' index='0'/>
-      <arg name='srcPath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='dstPath' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileManager:shouldMoveItemAtPath:toPath:'>
-      <arg name='fileManager' declared_type='NSFileManager*' type='@' index='0'/>
-      <arg name='srcPath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='dstPath' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileManager:shouldProceedAfterError:'>
-      <arg name='fm' declared_type='NSFileManager*' type='@' index='0'/>
-      <arg name='errorInfo' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileManager:shouldProceedAfterError:copyingItemAtPath:toPath:'>
-      <arg name='fileManager' declared_type='NSFileManager*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError*' type='@' index='1'/>
-      <arg name='srcPath' declared_type='NSString*' type='@' index='2'/>
-      <arg name='dstPath' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileManager:shouldProceedAfterError:linkingItemAtPath:toPath:'>
-      <arg name='fileManager' declared_type='NSFileManager*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError*' type='@' index='1'/>
-      <arg name='srcPath' declared_type='NSString*' type='@' index='2'/>
-      <arg name='dstPath' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileManager:shouldProceedAfterError:movingItemAtPath:toPath:'>
-      <arg name='fileManager' declared_type='NSFileManager*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError*' type='@' index='1'/>
-      <arg name='srcPath' declared_type='NSString*' type='@' index='2'/>
-      <arg name='dstPath' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileManager:shouldProceedAfterError:removingItemAtPath:'>
-      <arg name='fileManager' declared_type='NSFileManager*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError*' type='@' index='1'/>
-      <arg name='path' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileManager:shouldRemoveItemAtPath:'>
-      <arg name='fileManager' declared_type='NSFileManager*' type='@' index='0'/>
-      <arg name='path' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='fileManager:willProcessPath:'>
-      <arg name='fm' declared_type='NSFileManager*' type='@' index='0'/>
-      <arg name='path' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='finalize'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='forwardInvocation:'>
-      <arg name='anInvocation' declared_type='NSInvocation*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='handleMachMessage:'>
-      <arg name='msg' declared_type='void*' type='^v' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='handlePortMessage:'>
-      <arg name='message' declared_type='NSPortMessage*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='handleQueryWithUnboundKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='handleTakeValue:forUnboundKey:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='hash'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='indicesOfObjectsByEvaluatingObjectSpecifier:'>
-      <arg name='specifier' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithCoder:'>
-      <arg name='aDecoder' declared_type='NSCoder*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='initialize'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertValue:atIndex:inPropertyWithKey:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='key' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertValue:inPropertyWithKey:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='instanceMethodForSelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='IMP' type='^?'/>
-    </method>
-    <method class_method='true' selector='instanceMethodSignatureForSelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='NSMethodSignature*' type='@'/>
-    </method>
-    <method class_method='true' selector='instancesRespondToSelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='inverseForRelationshipKey:'>
-      <arg name='relationshipKey' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='isCaseInsensitiveLike:'>
-      <arg name='object' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEqual:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEqualTo:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isGreaterThan:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isGreaterThanOrEqualTo:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isKindOfClass:'>
-      <arg name='aClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isLessThan:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isLessThanOrEqualTo:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isLike:'>
-      <arg name='object' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isMemberOfClass:'>
-      <arg name='aClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isNotEqualTo:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isProxy'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='isSubclassOfClass:'>
-      <arg name='aClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='keyPathsForValuesAffectingValueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSSet*' type='@'/>
-    </method>
-    <method class_method='true' selector='load'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='lock'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='makeNewConnection:sender:'>
-      <arg name='conn' declared_type='NSConnection*' type='@' index='0'/>
-      <arg name='ancestor' declared_type='NSConnection*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='metadataQuery:replacementObjectForResultObject:'>
-      <arg name='query' declared_type='NSMetadataQuery*' type='@' index='0'/>
-      <arg name='result' declared_type='NSMetadataItem*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='metadataQuery:replacementValueForAttribute:value:'>
-      <arg name='query' declared_type='NSMetadataQuery*' type='@' index='0'/>
-      <arg name='attrName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='attrValue' declared_type='id' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='methodForSelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='IMP' type='^?'/>
-    </method>
-    <method selector='methodSignatureForSelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='NSMethodSignature*' type='@'/>
-    </method>
-    <method selector='mutableArrayValueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSMutableArray*' type='@'/>
-    </method>
-    <method selector='mutableArrayValueForKeyPath:'>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSMutableArray*' type='@'/>
-    </method>
-    <method selector='mutableCopy'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='mutableCopyWithZone:'>
-      <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='mutableCopyWithZone:'>
-      <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='mutableSetValueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSMutableSet*' type='@'/>
-    </method>
-    <method selector='mutableSetValueForKeyPath:'>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSMutableSet*' type='@'/>
-    </method>
-    <method selector='netService:didNotPublish:'>
-      <arg name='sender' declared_type='NSNetService*' type='@' index='0'/>
-      <arg name='errorDict' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netService:didNotResolve:'>
-      <arg name='sender' declared_type='NSNetService*' type='@' index='0'/>
-      <arg name='errorDict' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netService:didUpdateTXTRecordData:'>
-      <arg name='sender' declared_type='NSNetService*' type='@' index='0'/>
-      <arg name='data' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netServiceBrowser:didFindDomain:moreComing:'>
-      <arg name='aNetServiceBrowser' declared_type='NSNetServiceBrowser*' type='@' index='0'/>
-      <arg name='domainString' declared_type='NSString*' type='@' index='1'/>
-      <arg name='moreComing' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netServiceBrowser:didFindService:moreComing:'>
-      <arg name='aNetServiceBrowser' declared_type='NSNetServiceBrowser*' type='@' index='0'/>
-      <arg name='aNetService' declared_type='NSNetService*' type='@' index='1'/>
-      <arg name='moreComing' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netServiceBrowser:didNotSearch:'>
-      <arg name='aNetServiceBrowser' declared_type='NSNetServiceBrowser*' type='@' index='0'/>
-      <arg name='errorDict' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netServiceBrowser:didRemoveDomain:moreComing:'>
-      <arg name='aNetServiceBrowser' declared_type='NSNetServiceBrowser*' type='@' index='0'/>
-      <arg name='domainString' declared_type='NSString*' type='@' index='1'/>
-      <arg name='moreComing' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netServiceBrowser:didRemoveService:moreComing:'>
-      <arg name='aNetServiceBrowser' declared_type='NSNetServiceBrowser*' type='@' index='0'/>
-      <arg name='aNetService' declared_type='NSNetService*' type='@' index='1'/>
-      <arg name='moreComing' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netServiceBrowserDidStopSearch:'>
-      <arg name='aNetServiceBrowser' declared_type='NSNetServiceBrowser*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netServiceBrowserWillSearch:'>
-      <arg name='aNetServiceBrowser' declared_type='NSNetServiceBrowser*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netServiceDidPublish:'>
-      <arg name='sender' declared_type='NSNetService*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netServiceDidResolveAddress:'>
-      <arg name='sender' declared_type='NSNetService*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netServiceDidStop:'>
-      <arg name='sender' declared_type='NSNetService*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netServiceWillPublish:'>
-      <arg name='sender' declared_type='NSNetService*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='netServiceWillResolve:'>
-      <arg name='sender' declared_type='NSNetService*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='new'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='newScriptingObjectOfClass:forValueForKey:withContentsValue:properties:'>
-      <arg name='objectClass' declared_type='Class' type='#' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <arg name='contentsValue' declared_type='id' type='@' index='2'/>
-      <arg name='properties' declared_type='NSDictionary*' type='@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectSpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='observationInfo'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='observeValueForKeyPath:ofObject:change:context:'>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='object' declared_type='id' type='@' index='1'/>
-      <arg name='change' declared_type='NSDictionary*' type='@' index='2'/>
-      <arg name='context' declared_type='void*' type='^v' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:didEndElement:namespaceURI:qualifiedName:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='elementName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='2'/>
-      <arg name='qName' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:didEndMappingPrefix:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='prefix' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:didStartElement:namespaceURI:qualifiedName:attributes:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='elementName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='2'/>
-      <arg name='qName' declared_type='NSString*' type='@' index='3'/>
-      <arg name='attributeDict' declared_type='NSDictionary*' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:didStartMappingPrefix:toURI:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='prefix' declared_type='NSString*' type='@' index='1'/>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:foundAttributeDeclarationWithName:forElement:type:defaultValue:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='attributeName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='elementName' declared_type='NSString*' type='@' index='2'/>
-      <arg name='type' declared_type='NSString*' type='@' index='3'/>
-      <arg name='defaultValue' declared_type='NSString*' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:foundCDATA:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='CDATABlock' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:foundCharacters:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='string' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:foundComment:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='comment' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:foundElementDeclarationWithName:model:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='elementName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='model' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:foundExternalEntityDeclarationWithName:publicID:systemID:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <arg name='publicID' declared_type='NSString*' type='@' index='2'/>
-      <arg name='systemID' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:foundIgnorableWhitespace:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='whitespaceString' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:foundInternalEntityDeclarationWithName:value:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <arg name='value' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:foundNotationDeclarationWithName:publicID:systemID:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <arg name='publicID' declared_type='NSString*' type='@' index='2'/>
-      <arg name='systemID' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:foundProcessingInstructionWithTarget:data:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='target' declared_type='NSString*' type='@' index='1'/>
-      <arg name='data' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:foundUnparsedEntityDeclarationWithName:publicID:systemID:notationName:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <arg name='publicID' declared_type='NSString*' type='@' index='2'/>
-      <arg name='systemID' declared_type='NSString*' type='@' index='3'/>
-      <arg name='notationName' declared_type='NSString*' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:parseErrorOccurred:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='parseError' declared_type='NSError*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parser:resolveExternalEntityName:systemID:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <arg name='systemID' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='parser:validationErrorOccurred:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <arg name='validationError' declared_type='NSError*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parserDidEndDocument:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parserDidStartDocument:'>
-      <arg name='parser' declared_type='NSXMLParser*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performSelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='performSelector:onThread:withObject:waitUntilDone:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='thr' declared_type='NSThread*' type='@' index='1'/>
-      <arg name='arg' declared_type='id' type='@' index='2'/>
-      <arg name='wait' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performSelector:onThread:withObject:waitUntilDone:modes:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='thr' declared_type='NSThread*' type='@' index='1'/>
-      <arg name='arg' declared_type='id' type='@' index='2'/>
-      <arg name='wait' declared_type='BOOL' type='B' index='3'/>
-      <arg name='array' declared_type='NSArray*' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performSelector:withObject:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='object' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='performSelector:withObject:afterDelay:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='anArgument' declared_type='id' type='@' index='1'/>
-      <arg name='delay' declared_type='NSTimeInterval' type='d' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performSelector:withObject:afterDelay:inModes:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='anArgument' declared_type='id' type='@' index='1'/>
-      <arg name='delay' declared_type='NSTimeInterval' type='d' index='2'/>
-      <arg name='modes' declared_type='NSArray*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performSelector:withObject:withObject:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='object1' declared_type='id' type='@' index='1'/>
-      <arg name='object2' declared_type='id' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='performSelectorInBackground:withObject:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='arg' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performSelectorOnMainThread:withObject:waitUntilDone:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='arg' declared_type='id' type='@' index='1'/>
-      <arg name='wait' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='performSelectorOnMainThread:withObject:waitUntilDone:modes:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='arg' declared_type='id' type='@' index='1'/>
-      <arg name='wait' declared_type='BOOL' type='B' index='2'/>
-      <arg name='array' declared_type='NSArray*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='poseAsClass:'>
-      <arg name='aClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='release'>
-      <retval declared_type='oneway void' type='v'/>
-    </method>
-    <method selector='removeObserver:forKeyPath:'>
-      <arg name='observer' declared_type='NSObject*' type='@' index='0'/>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeValueAtIndex:fromPropertyWithKey:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceValueAtIndex:inPropertyWithKey:withValue:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <arg name='value' declared_type='id' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replacementObjectForArchiver:'>
-      <arg name='archiver' declared_type='NSArchiver*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='replacementObjectForCoder:'>
-      <arg name='aCoder' declared_type='NSCoder*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='replacementObjectForKeyedArchiver:'>
-      <arg name='archiver' declared_type='NSKeyedArchiver*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='replacementObjectForPortCoder:'>
-      <arg name='coder' declared_type='NSPortCoder*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='resolveClassMethod:'>
-      <arg name='sel' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='resolveInstanceMethod:'>
-      <arg name='sel' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='respondsToSelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='retain'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='retainCount'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='roundingMode'>
-      <retval declared_type='NSRoundingMode' type='I' type64='Q'/>
-    </method>
-    <method selector='scale'>
-      <retval declared_type='short' type='s'/>
-    </method>
-    <method selector='scriptingBeginsWith:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scriptingContains:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scriptingEndsWith:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scriptingIsEqualTo:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scriptingIsGreaterThan:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scriptingIsGreaterThanOrEqualTo:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scriptingIsLessThan:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scriptingIsLessThanOrEqualTo:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scriptingProperties'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='scriptingValueForSpecifier:'>
-      <arg name='objectSpecifier' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='self'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='setKeys:triggerChangeNotificationsForDependentKey:'>
-      <arg name='keys' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='dependentKey' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNilValueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObservationInfo:'>
-      <arg name='observationInfo' declared_type='void*' type='^v' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setScriptingProperties:'>
-      <arg name='properties' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValue:forKey:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValue:forKeyPath:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValue:forUndefinedKey:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setValuesForKeysWithDictionary:'>
-      <arg name='keyedValues' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setVersion:'>
-      <arg name='aVersion' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='spellServer:checkGrammarInString:language:details:'>
-      <arg name='sender' declared_type='NSSpellServer*' type='@' index='0'/>
-      <arg name='stringToCheck' declared_type='NSString*' type='@' index='1'/>
-      <arg name='language' declared_type='NSString*' type='@' index='2'/>
-      <arg name='details' declared_type='NSArray**' type='^@' index='3'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='spellServer:didForgetWord:inLanguage:'>
-      <arg name='sender' declared_type='NSSpellServer*' type='@' index='0'/>
-      <arg name='word' declared_type='NSString*' type='@' index='1'/>
-      <arg name='language' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='spellServer:didLearnWord:inLanguage:'>
-      <arg name='sender' declared_type='NSSpellServer*' type='@' index='0'/>
-      <arg name='word' declared_type='NSString*' type='@' index='1'/>
-      <arg name='language' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='spellServer:findMisspelledWordInString:language:wordCount:countOnly:'>
-      <arg name='sender' declared_type='NSSpellServer*' type='@' index='0'/>
-      <arg name='stringToCheck' declared_type='NSString*' type='@' index='1'/>
-      <arg name='language' declared_type='NSString*' type='@' index='2'/>
-      <arg name='wordCount' declared_type='NSInteger*' type='^i' type64='^q' index='3'/>
-      <arg name='countOnly' declared_type='BOOL' type='B' index='4'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='spellServer:suggestCompletionsForPartialWordRange:inString:language:'>
-      <arg name='sender' declared_type='NSSpellServer*' type='@' index='0'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <arg name='string' declared_type='NSString*' type='@' index='2'/>
-      <arg name='language' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='spellServer:suggestGuessesForWord:inLanguage:'>
-      <arg name='sender' declared_type='NSSpellServer*' type='@' index='0'/>
-      <arg name='word' declared_type='NSString*' type='@' index='1'/>
-      <arg name='language' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='storedValueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='stream:handleEvent:'>
-      <arg name='aStream' declared_type='NSStream*' type='@' index='0'/>
-      <arg name='eventCode' declared_type='NSStreamEvent' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='superclass'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='superclass'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='takeStoredValue:forKey:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeValue:forKey:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeValue:forKeyPath:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='takeValuesFromDictionary:'>
-      <arg name='properties' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toManyRelationshipKeys'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='toOneRelationshipKeys'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='unableToSetNilForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='unarchiver:cannotDecodeObjectOfClassName:originalClasses:'>
-      <arg name='unarchiver' declared_type='NSKeyedUnarchiver*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <arg name='classNames' declared_type='NSArray*' type='@' index='2'/>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='unarchiver:didDecodeObject:'>
-      <arg name='unarchiver' declared_type='NSKeyedUnarchiver*' type='@' index='0'/>
-      <arg name='object' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='unarchiver:willReplaceObject:withObject:'>
-      <arg name='unarchiver' declared_type='NSKeyedUnarchiver*' type='@' index='0'/>
-      <arg name='object' declared_type='id' type='@' index='1'/>
-      <arg name='newObject' declared_type='id' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='unarchiverDidFinish:'>
-      <arg name='unarchiver' declared_type='NSKeyedUnarchiver*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='unarchiverWillFinish:'>
-      <arg name='unarchiver' declared_type='NSKeyedUnarchiver*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='unlock'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='useCredential:forAuthenticationChallenge:'>
-      <arg name='credential' declared_type='NSURLCredential*' type='@' index='0'/>
-      <arg name='challenge' declared_type='NSURLAuthenticationChallenge*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='useStoredAccessor'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='validateValue:forKey:error:'>
-      <arg name='ioValue' declared_type='id*' type='^@' index='0'/>
-      <arg name='inKey' declared_type='NSString*' type='@' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='validateValue:forKeyPath:error:'>
-      <arg name='ioValue' declared_type='id*' type='^@' index='0'/>
-      <arg name='inKeyPath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='outError' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='valueAtIndex:inPropertyWithKey:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='valueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='valueForKeyPath:'>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='valueForUndefinedKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='valueWithName:inPropertyWithKey:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='valueWithUniqueID:inPropertyWithKey:'>
-      <arg name='uniqueID' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='valuesForKeys:'>
-      <arg name='keys' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method class_method='true' selector='version'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='willChange:valuesAtIndexes:forKey:'>
-      <arg name='changeKind' declared_type='NSKeyValueChange' type='I' type64='Q' index='0'/>
-      <arg name='indexes' declared_type='NSIndexSet*' type='@' index='1'/>
-      <arg name='key' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='willChangeValueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='willChangeValueForKey:withSetMutation:usingObjects:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='mutationKind' declared_type='NSKeyValueSetMutationKind' type='I' type64='Q' index='1'/>
-      <arg name='objects' declared_type='NSSet*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='zone'>
-      <retval declared_type='NSZone*' type='^{_NSZone=}'/>
-    </method>
-  </class>
-  <class name='NSOperation'>
-    <method selector='addDependency:'>
-      <arg name='op' declared_type='NSOperation*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='cancel'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='dependencies'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isCancelled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isConcurrent'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isExecuting'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isFinished'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isReady'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='main'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='queuePriority'>
-      <retval declared_type='NSOperationQueuePriority' type='i' type64='q'/>
-    </method>
-    <method selector='removeDependency:'>
-      <arg name='op' declared_type='NSOperation*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setQueuePriority:'>
-      <arg name='p' declared_type='NSOperationQueuePriority' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='start'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSOperationQueue'>
-    <method selector='addOperation:'>
-      <arg name='op' declared_type='NSOperation*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='cancelAllOperations'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isSuspended'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='maxConcurrentOperationCount'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='operations'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='setMaxConcurrentOperationCount:'>
-      <arg name='cnt' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSuspended:'>
-      <arg name='b' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='waitUntilAllOperationsAreFinished'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSOutputStream'>
-    <method selector='hasSpaceAvailable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initToBuffer:capacity:'>
-      <arg name='buffer' declared_type='uint8_t*' type='*' index='0'/>
-      <arg name='capacity' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initToFileAtPath:append:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='shouldAppend' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initToMemory'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='outputStreamToBuffer:capacity:'>
-      <arg name='buffer' declared_type='uint8_t*' type='*' index='0'/>
-      <arg name='capacity' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='outputStreamToFileAtPath:append:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='shouldAppend' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='outputStreamToMemory'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='write:maxLength:'>
-      <arg name='buffer' declared_type='uint8_t*' type='*' const='true' index='0'/>
-      <arg name='len' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-  </class>
-  <class name='NSPipe'>
-    <method selector='fileHandleForReading'>
-      <retval declared_type='NSFileHandle*' type='@'/>
-    </method>
-    <method selector='fileHandleForWriting'>
-      <retval declared_type='NSFileHandle*' type='@'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='pipe'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSPointerArray'>
-    <method selector='addPointer:'>
-      <arg name='pointer' declared_type='void*' type='^v' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='allObjects'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='compact'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='count'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='initWithOptions:'>
-      <arg name='options' declared_type='NSPointerFunctionsOptions' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithPointerFunctions:'>
-      <arg name='functions' declared_type='NSPointerFunctions*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertPointer:atIndex:'>
-      <arg name='item' declared_type='void*' type='^v' index='0'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='pointerArrayWithOptions:'>
-      <arg name='options' declared_type='NSPointerFunctionsOptions' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='pointerArrayWithPointerFunctions:'>
-      <arg name='functions' declared_type='NSPointerFunctions*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='pointerArrayWithStrongObjects'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='pointerArrayWithWeakObjects'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='pointerAtIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='pointerFunctions'>
-      <retval declared_type='NSPointerFunctions*' type='@'/>
-    </method>
-    <method selector='removePointerAtIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replacePointerAtIndex:withPointer:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='item' declared_type='void*' type='^v' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCount:'>
-      <arg name='count' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSPointerFunctions'>
-    <method selector='initWithOptions:'>
-      <arg name='options' declared_type='NSPointerFunctionsOptions' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='pointerFunctionsWithOptions:'>
-      <arg name='options' declared_type='NSPointerFunctionsOptions' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setUsesStrongWriteBarrier:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesWeakReadAndWriteBarriers:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='usesStrongWriteBarrier'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='usesWeakReadAndWriteBarriers'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSPort'>
-    <method selector='addConnection:toRunLoop:forMode:'>
-      <arg name='conn' declared_type='NSConnection*' type='@' index='0'/>
-      <arg name='runLoop' declared_type='NSRunLoop*' type='@' index='1'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='allocWithZone:'>
-      <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='invalidate'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isValid'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='port'>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='removeConnection:fromRunLoop:forMode:'>
-      <arg name='conn' declared_type='NSConnection*' type='@' index='0'/>
-      <arg name='runLoop' declared_type='NSRunLoop*' type='@' index='1'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeFromRunLoop:forMode:'>
-      <arg name='runLoop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='reservedSpaceLength'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='scheduleInRunLoop:forMode:'>
-      <arg name='runLoop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='sendBeforeDate:components:from:reserved:'>
-      <arg name='limitDate' declared_type='NSDate*' type='@' index='0'/>
-      <arg name='components' declared_type='NSMutableArray*' type='@' index='1'/>
-      <arg name='receivePort' declared_type='NSPort*' type='@' index='2'/>
-      <arg name='headerSpaceReserved' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='sendBeforeDate:msgid:components:from:reserved:'>
-      <arg name='limitDate' declared_type='NSDate*' type='@' index='0'/>
-      <arg name='msgID' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='components' declared_type='NSMutableArray*' type='@' index='2'/>
-      <arg name='receivePort' declared_type='NSPort*' type='@' index='3'/>
-      <arg name='headerSpaceReserved' declared_type='NSUInteger' type='I' type64='Q' index='4'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anId' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSPortCoder'>
-    <method selector='connection'>
-      <retval declared_type='NSConnection*' type='@'/>
-    </method>
-    <method selector='decodePortObject'>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='dispatch'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='encodePortObject:'>
-      <arg name='aport' declared_type='NSPort*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithReceivePort:sendPort:components:'>
-      <arg name='rcvPort' declared_type='NSPort*' type='@' index='0'/>
-      <arg name='sndPort' declared_type='NSPort*' type='@' index='1'/>
-      <arg name='comps' declared_type='NSArray*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isBycopy'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isByref'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='portCoderWithReceivePort:sendPort:components:'>
-      <arg name='rcvPort' declared_type='NSPort*' type='@' index='0'/>
-      <arg name='sndPort' declared_type='NSPort*' type='@' index='1'/>
-      <arg name='comps' declared_type='NSArray*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSPortMessage'>
-    <method selector='components'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='initWithSendPort:receivePort:components:'>
-      <arg name='sendPort' declared_type='NSPort*' type='@' index='0'/>
-      <arg name='replyPort' declared_type='NSPort*' type='@' index='1'/>
-      <arg name='components' declared_type='NSArray*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='msgid'>
-      <retval declared_type='uint32_t' type='I'/>
-    </method>
-    <method selector='receivePort'>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='sendBeforeDate:'>
-      <arg name='date' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='sendPort'>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='setMsgid:'>
-      <arg name='msgid' declared_type='uint32_t' type='I' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSPortNameServer'>
-    <method selector='portForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='portForName:host:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='host' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='registerPort:name:'>
-      <arg name='port' declared_type='NSPort*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='removePortForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='systemDefaultPortNameServer'>
-      <retval declared_type='NSPortNameServer*' type='@'/>
-    </method>
-  </class>
-  <class name='NSPositionalSpecifier'>
-    <method selector='evaluate'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithPosition:objectSpecifier:'>
-      <arg name='position' declared_type='NSInsertionPosition' type='I' type64='Q' index='0'/>
-      <arg name='specifier' declared_type='NSScriptObjectSpecifier*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertionContainer'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertionIndex'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='insertionKey'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='insertionReplaces'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='objectSpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='position'>
-      <retval declared_type='NSInsertionPosition' type='I' type64='Q'/>
-    </method>
-    <method selector='setInsertionClassDescription:'>
-      <arg name='classDescription' declared_type='NSScriptClassDescription*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSPredicate'>
-    <method selector='evaluateWithObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='evaluateWithObject:substitutionVariables:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <arg name='bindings' declared_type='NSDictionary*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='predicateFormat'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' variadic='true' selector='predicateWithFormat:'>
-      <arg name='predicateWithFormat' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method class_method='true' selector='predicateWithFormat:argumentArray:'>
-      <arg name='predicateFormat' declared_type='NSString*' type='@' index='0'/>
-      <arg name='arguments' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method class_method='true' selector='predicateWithFormat:arguments:'>
-      <arg name='predicateFormat' declared_type='NSString*' type='@' index='0'/>
-      <arg name='argList' declared_type='va_list' type='*' type64='[1{?=II^v^v}]' index='1'/>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method selector='predicateWithSubstitutionVariables:'>
-      <arg name='variables' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-    <method class_method='true' selector='predicateWithValue:'>
-      <arg name='value' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='NSPredicate*' type='@'/>
-    </method>
-  </class>
-  <class name='NSProcessInfo'>
-    <method selector='activeProcessorCount'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='arguments'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='environment'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='globallyUniqueString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='hostName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='operatingSystem'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='operatingSystemName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='operatingSystemVersionString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='physicalMemory'>
-      <retval declared_type='unsigned long long' type='Q'/>
-    </method>
-    <method selector='processIdentifier'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method class_method='true' selector='processInfo'>
-      <retval declared_type='NSProcessInfo*' type='@'/>
-    </method>
-    <method selector='processName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='processorCount'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='setProcessName:'>
-      <arg name='newName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSPropertyListSerialization'>
-    <method class_method='true' selector='dataFromPropertyList:format:errorDescription:'>
-      <arg name='plist' declared_type='id' type='@' index='0'/>
-      <arg name='format' declared_type='NSPropertyListFormat' type='I' type64='Q' index='1'/>
-      <arg name='errorString' declared_type='NSString**' type='^@' index='2'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method class_method='true' selector='propertyList:isValidForFormat:'>
-      <arg name='plist' declared_type='id' type='@' index='0'/>
-      <arg name='format' declared_type='NSPropertyListFormat' type='I' type64='Q' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='propertyListFromData:mutabilityOption:format:errorDescription:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='opt' declared_type='NSPropertyListMutabilityOptions' type='I' type64='Q' index='1'/>
-      <arg name='format' declared_type='NSPropertyListFormat*' type='^I' type64='^Q' index='2'/>
-      <arg name='errorString' declared_type='NSString**' type='^@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSProtocolChecker'>
-    <method selector='initWithTarget:protocol:'>
-      <arg name='anObject' declared_type='NSObject*' type='@' index='0'/>
-      <arg name='aProtocol' declared_type='Protocol*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='protocol'>
-      <retval declared_type='Protocol*' type='@'/>
-    </method>
-    <method class_method='true' selector='protocolCheckerWithTarget:protocol:'>
-      <arg name='anObject' declared_type='NSObject*' type='@' index='0'/>
-      <arg name='aProtocol' declared_type='Protocol*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='target'>
-      <retval declared_type='NSObject*' type='@'/>
-    </method>
-  </class>
-  <class name='NSProxy'>
-    <method class_method='true' selector='alloc'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='allocWithZone:'>
-      <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='class'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='dealloc'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='description'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='finalize'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='forwardInvocation:'>
-      <arg name='invocation' declared_type='NSInvocation*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='methodSignatureForSelector:'>
-      <arg name='sel' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='NSMethodSignature*' type='@'/>
-    </method>
-    <method class_method='true' selector='respondsToSelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSQuitCommand'>
-    <method selector='saveOptions'>
-      <retval declared_type='NSSaveOptions' type='I' type64='Q'/>
-    </method>
-  </class>
-  <class name='NSRangeSpecifier'>
-    <method selector='endSpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='initWithContainerClassDescription:containerSpecifier:key:startSpecifier:endSpecifier:'>
-      <arg name='classDesc' declared_type='NSScriptClassDescription*' type='@' index='0'/>
-      <arg name='container' declared_type='NSScriptObjectSpecifier*' type='@' index='1'/>
-      <arg name='property' declared_type='NSString*' type='@' index='2'/>
-      <arg name='startSpec' declared_type='NSScriptObjectSpecifier*' type='@' index='3'/>
-      <arg name='endSpec' declared_type='NSScriptObjectSpecifier*' type='@' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setEndSpecifier:'>
-      <arg name='endSpec' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStartSpecifier:'>
-      <arg name='startSpec' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='startSpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-  </class>
-  <class name='NSRecursiveLock'>
-    <method selector='lockBeforeDate:'>
-      <arg name='limit' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setName:'>
-      <arg name='n' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tryLock'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSRelativeSpecifier'>
-    <method selector='baseSpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='initWithContainerClassDescription:containerSpecifier:key:relativePosition:baseSpecifier:'>
-      <arg name='classDesc' declared_type='NSScriptClassDescription*' type='@' index='0'/>
-      <arg name='container' declared_type='NSScriptObjectSpecifier*' type='@' index='1'/>
-      <arg name='property' declared_type='NSString*' type='@' index='2'/>
-      <arg name='relPos' declared_type='NSRelativePosition' type='I' type64='Q' index='3'/>
-      <arg name='baseSpecifier' declared_type='NSScriptObjectSpecifier*' type='@' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='relativePosition'>
-      <retval declared_type='NSRelativePosition' type='I' type64='Q'/>
-    </method>
-    <method selector='setBaseSpecifier:'>
-      <arg name='baseSpecifier' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRelativePosition:'>
-      <arg name='relPos' declared_type='NSRelativePosition' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSRunLoop'>
-    <method selector='acceptInputForMode:beforeDate:'>
-      <arg name='mode' declared_type='NSString*' type='@' index='0'/>
-      <arg name='limitDate' declared_type='NSDate*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addPort:forMode:'>
-      <arg name='aPort' declared_type='NSPort*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addTimer:forMode:'>
-      <arg name='timer' declared_type='NSTimer*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='cancelPerformSelector:target:argument:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='target' declared_type='id' type='@' index='1'/>
-      <arg name='arg' declared_type='id' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='cancelPerformSelectorsWithTarget:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='configureAsServer'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='currentMode'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='currentRunLoop'>
-      <retval declared_type='NSRunLoop*' type='@'/>
-    </method>
-    <method selector='getCFRunLoop'>
-      <retval declared_type='CFRunLoopRef' type='^{__CFRunLoop=}'/>
-    </method>
-    <method selector='limitDateForMode:'>
-      <arg name='mode' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method class_method='true' selector='mainRunLoop'>
-      <retval declared_type='NSRunLoop*' type='@'/>
-    </method>
-    <method selector='performSelector:target:argument:order:modes:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='target' declared_type='id' type='@' index='1'/>
-      <arg name='arg' declared_type='id' type='@' index='2'/>
-      <arg name='order' declared_type='NSUInteger' type='I' type64='Q' index='3'/>
-      <arg name='modes' declared_type='NSArray*' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removePort:forMode:'>
-      <arg name='aPort' declared_type='NSPort*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='run'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='runMode:beforeDate:'>
-      <arg name='mode' declared_type='NSString*' type='@' index='0'/>
-      <arg name='limitDate' declared_type='NSDate*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='runUntilDate:'>
-      <arg name='limitDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSScanner'>
-    <method selector='caseSensitive'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='charactersToBeSkipped'>
-      <retval declared_type='NSCharacterSet*' type='@'/>
-    </method>
-    <method selector='initWithString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isAtEnd'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='locale'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='localizedScannerWithString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='scanCharactersFromSet:intoString:'>
-      <arg name='set' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <arg name='value' declared_type='NSString**' type='^@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanDecimal:'>
-      <arg name='dcm' declared_type='NSDecimal*' type='^{_NSDecimal=b8b4b1b1b18[8S]}' index='0' type_modifier='o'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanDouble:'>
-      <arg name='value' declared_type='double*' type='^d' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanFloat:'>
-      <arg name='value' declared_type='float*' type='^f' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanHexDouble:'>
-      <arg name='result' declared_type='double*' type='^d' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanHexFloat:'>
-      <arg name='result' declared_type='float*' type='^f' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanHexInt:'>
-      <arg name='value' declared_type='unsigned*' type='^I' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanHexLongLong:'>
-      <arg name='result' declared_type='unsigned long long*' type='^Q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanInt:'>
-      <arg name='value' declared_type='int*' type='^i' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanInteger:'>
-      <arg name='value' declared_type='NSInteger*' type='^i' type64='^q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanLocation'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='scanLongLong:'>
-      <arg name='value' declared_type='long long*' type='^q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanString:intoString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='value' declared_type='NSString**' type='^@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanUpToCharactersFromSet:intoString:'>
-      <arg name='set' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <arg name='value' declared_type='NSString**' type='^@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='scanUpToString:intoString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='value' declared_type='NSString**' type='^@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='scannerWithString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setCaseSensitive:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCharactersToBeSkipped:'>
-      <arg name='set' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLocale:'>
-      <arg name='locale' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setScanLocation:'>
-      <arg name='pos' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='string'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSScriptClassDescription'>
-    <method selector='appleEventCode'>
-      <retval declared_type='FourCharCode' type='L' type64='I'/>
-    </method>
-    <method selector='appleEventCodeForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='FourCharCode' type='L' type64='I'/>
-    </method>
-    <method class_method='true' selector='classDescriptionForClass:'>
-      <arg name='aClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='NSScriptClassDescription*' type='@'/>
-    </method>
-    <method selector='classDescriptionForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSScriptClassDescription*' type='@'/>
-    </method>
-    <method selector='className'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='defaultSubcontainerAttributeKey'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='hasOrderedToManyRelationshipForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasPropertyForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasReadablePropertyForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasWritablePropertyForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='implementationClassName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='initWithSuiteName:className:dictionary:'>
-      <arg name='suiteName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='className' declared_type='NSString*' type='@' index='1'/>
-      <arg name='classDeclaration' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isLocationRequiredToCreateForKey:'>
-      <arg name='toManyRelationshipKey' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isReadOnlyKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keyWithAppleEventCode:'>
-      <arg name='appleEventCode' declared_type='FourCharCode' type='L' type64='I' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='matchesAppleEventCode:'>
-      <arg name='appleEventCode' declared_type='FourCharCode' type='L' type64='I' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectorForCommand:'>
-      <arg name='commandDescription' declared_type='NSScriptCommandDescription*' type='@' index='0'/>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-    <method selector='suiteName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='superclassDescription'>
-      <retval declared_type='NSScriptClassDescription*' type='@'/>
-    </method>
-    <method selector='supportsCommand:'>
-      <arg name='commandDescription' declared_type='NSScriptCommandDescription*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='typeForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSScriptCoercionHandler'>
-    <method selector='coerceValue:toClass:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='toClass' declared_type='Class' type='#' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='registerCoercer:selector:toConvertFromClass:toClass:'>
-      <arg name='coercer' declared_type='id' type='@' index='0'/>
-      <arg name='selector' declared_type='SEL' type=':' index='1'/>
-      <arg name='fromClass' declared_type='Class' type='#' index='2'/>
-      <arg name='toClass' declared_type='Class' type='#' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedCoercionHandler'>
-      <retval declared_type='NSScriptCoercionHandler*' type='@'/>
-    </method>
-  </class>
-  <class name='NSScriptCommand'>
-    <method selector='appleEvent'>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='arguments'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='commandDescription'>
-      <retval declared_type='NSScriptCommandDescription*' type='@'/>
-    </method>
-    <method class_method='true' selector='currentCommand'>
-      <retval declared_type='NSScriptCommand*' type='@'/>
-    </method>
-    <method selector='directParameter'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='evaluatedArguments'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='evaluatedReceivers'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='executeCommand'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithCommandDescription:'>
-      <arg name='commandDef' declared_type='NSScriptCommandDescription*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isWellFormed'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='performDefaultImplementation'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='receiversSpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='resumeExecutionWithResult:'>
-      <arg name='result' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scriptErrorExpectedTypeDescriptor'>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='scriptErrorNumber'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='scriptErrorOffendingObjectDescriptor'>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='scriptErrorString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setArguments:'>
-      <arg name='args' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDirectParameter:'>
-      <arg name='directParameter' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setReceiversSpecifier:'>
-      <arg name='receiversRef' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setScriptErrorExpectedTypeDescriptor:'>
-      <arg name='errorExpectedTypeDescriptor' declared_type='NSAppleEventDescriptor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setScriptErrorNumber:'>
-      <arg name='errorNumber' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setScriptErrorOffendingObjectDescriptor:'>
-      <arg name='errorOffendingObjectDescriptor' declared_type='NSAppleEventDescriptor*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setScriptErrorString:'>
-      <arg name='errorString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='suspendExecution'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSScriptCommandDescription'>
-    <method selector='appleEventClassCode'>
-      <retval declared_type='FourCharCode' type='L' type64='I'/>
-    </method>
-    <method selector='appleEventCode'>
-      <retval declared_type='FourCharCode' type='L' type64='I'/>
-    </method>
-    <method selector='appleEventCodeForArgumentWithName:'>
-      <arg name='argumentName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='FourCharCode' type='L' type64='I'/>
-    </method>
-    <method selector='appleEventCodeForReturnType'>
-      <retval declared_type='FourCharCode' type='L' type64='I'/>
-    </method>
-    <method selector='argumentNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='commandClassName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='commandName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='createCommandInstance'>
-      <retval declared_type='NSScriptCommand*' type='@'/>
-    </method>
-    <method selector='createCommandInstanceWithZone:'>
-      <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' index='0'/>
-      <retval declared_type='NSScriptCommand*' type='@'/>
-    </method>
-    <method selector='initWithSuiteName:commandName:dictionary:'>
-      <arg name='suiteName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='commandName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='commandDeclaration' declared_type='NSDictionary*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isOptionalArgumentWithName:'>
-      <arg name='argumentName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='returnType'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='suiteName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='typeForArgumentWithName:'>
-      <arg name='argumentName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSScriptExecutionContext'>
-    <method selector='objectBeingTested'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='rangeContainerObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setObjectBeingTested:'>
-      <arg name='obj' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRangeContainerObject:'>
-      <arg name='obj' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTopLevelObject:'>
-      <arg name='obj' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedScriptExecutionContext'>
-      <retval declared_type='NSScriptExecutionContext*' type='@'/>
-    </method>
-    <method selector='topLevelObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSScriptObjectSpecifier'>
-    <method selector='childSpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='containerClassDescription'>
-      <retval declared_type='NSScriptClassDescription*' type='@'/>
-    </method>
-    <method selector='containerIsObjectBeingTested'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='containerIsRangeContainerObject'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='containerSpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='descriptor'>
-      <retval declared_type='NSAppleEventDescriptor*' type='@'/>
-    </method>
-    <method selector='evaluationErrorNumber'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='evaluationErrorSpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='indicesOfObjectsByEvaluatingWithContainer:count:'>
-      <arg name='container' declared_type='id' type='@' index='0'/>
-      <arg name='count' declared_type='NSInteger*' type='^i' type64='^q' index='1'/>
-      <retval declared_type='NSInteger*' type='^i' type64='^q'/>
-    </method>
-    <method selector='initWithContainerClassDescription:containerSpecifier:key:'>
-      <arg name='classDesc' declared_type='NSScriptClassDescription*' type='@' index='0'/>
-      <arg name='container' declared_type='NSScriptObjectSpecifier*' type='@' index='1'/>
-      <arg name='property' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContainerSpecifier:key:'>
-      <arg name='container' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <arg name='property' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='key'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='keyClassDescription'>
-      <retval declared_type='NSScriptClassDescription*' type='@'/>
-    </method>
-    <method class_method='true' selector='objectSpecifierWithDescriptor:'>
-      <arg name='descriptor' declared_type='NSAppleEventDescriptor*' type='@' index='0'/>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='objectsByEvaluatingSpecifier'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectsByEvaluatingWithContainers:'>
-      <arg name='containers' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setChildSpecifier:'>
-      <arg name='child' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContainerClassDescription:'>
-      <arg name='classDesc' declared_type='NSScriptClassDescription*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContainerIsObjectBeingTested:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContainerIsRangeContainerObject:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContainerSpecifier:'>
-      <arg name='subRef' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEvaluationErrorNumber:'>
-      <arg name='error' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSScriptSuiteRegistry'>
-    <method selector='aeteResource:'>
-      <arg name='languageName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='appleEventCodeForSuite:'>
-      <arg name='suiteName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='FourCharCode' type='L' type64='I'/>
-    </method>
-    <method selector='bundleForSuite:'>
-      <arg name='suiteName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSBundle*' type='@'/>
-    </method>
-    <method selector='classDescriptionWithAppleEventCode:'>
-      <arg name='appleEventCode' declared_type='FourCharCode' type='L' type64='I' index='0'/>
-      <retval declared_type='NSScriptClassDescription*' type='@'/>
-    </method>
-    <method selector='classDescriptionsInSuite:'>
-      <arg name='suiteName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='commandDescriptionWithAppleEventClass:andAppleEventCode:'>
-      <arg name='appleEventClassCode' declared_type='FourCharCode' type='L' type64='I' index='0'/>
-      <arg name='appleEventIDCode' declared_type='FourCharCode' type='L' type64='I' index='1'/>
-      <retval declared_type='NSScriptCommandDescription*' type='@'/>
-    </method>
-    <method selector='commandDescriptionsInSuite:'>
-      <arg name='suiteName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='loadSuiteWithDictionary:fromBundle:'>
-      <arg name='suiteDeclaration' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='bundle' declared_type='NSBundle*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='loadSuitesFromBundle:'>
-      <arg name='bundle' declared_type='NSBundle*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='registerClassDescription:'>
-      <arg name='classDescription' declared_type='NSScriptClassDescription*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='registerCommandDescription:'>
-      <arg name='commandDescription' declared_type='NSScriptCommandDescription*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setSharedScriptSuiteRegistry:'>
-      <arg name='registry' declared_type='NSScriptSuiteRegistry*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedScriptSuiteRegistry'>
-      <retval declared_type='NSScriptSuiteRegistry*' type='@'/>
-    </method>
-    <method selector='suiteForAppleEventCode:'>
-      <arg name='appleEventCode' declared_type='FourCharCode' type='L' type64='I' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='suiteNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSScriptWhoseTest'>
-    <method selector='isTrue'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSSet'>
-    <method selector='addObserver:forKeyPath:options:context:'>
-      <arg name='observer' declared_type='NSObject*' type='@' index='0'/>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='1'/>
-      <arg name='options' declared_type='NSKeyValueObservingOptions' type='I' type64='Q' index='2'/>
-      <arg name='context' declared_type='void*' type='^v' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='allObjects'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='anyObject'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='containsObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='count'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='description'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='descriptionWithLocale:'>
-      <arg name='locale' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='filteredSetUsingPredicate:'>
-      <arg name='predicate' declared_type='NSPredicate*' type='@' index='0'/>
-      <retval declared_type='NSSet*' type='@'/>
-    </method>
-    <method selector='initWithArray:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method variadic='true' selector='initWithObjects:'>
-      <arg name='initWithObjects' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithObjects:count:'>
-      <arg name='objects' declared_type='id*' type='^@' index='0'/>
-      <arg name='cnt' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithSet:'>
-      <arg name='set' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithSet:copyItems:'>
-      <arg name='set' declared_type='NSSet*' type='@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='intersectsSet:'>
-      <arg name='otherSet' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEqualToSet:'>
-      <arg name='otherSet' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSubsetOfSet:'>
-      <arg name='otherSet' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='makeObjectsPerformSelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='makeObjectsPerformSelector:withObject:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <arg name='argument' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='member:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectEnumerator'>
-      <retval declared_type='NSEnumerator*' type='@'/>
-    </method>
-    <method selector='removeObserver:forKeyPath:'>
-      <arg name='observer' declared_type='NSObject*' type='@' index='0'/>
-      <arg name='keyPath' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='set'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setByAddingObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSSet*' type='@'/>
-    </method>
-    <method selector='setByAddingObjectsFromArray:'>
-      <arg name='other' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSSet*' type='@'/>
-    </method>
-    <method selector='setByAddingObjectsFromSet:'>
-      <arg name='other' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='NSSet*' type='@'/>
-    </method>
-    <method selector='setValue:forKey:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setWithArray:'>
-      <arg name='array' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='setWithObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' variadic='true' selector='setWithObjects:'>
-      <arg name='setWithObjects' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='setWithObjects:count:'>
-      <arg name='objects' declared_type='id*' type='^@' index='0'/>
-      <arg name='cnt' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='setWithSet:'>
-      <arg name='set' declared_type='NSSet*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='valueForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSSetCommand'>
-    <method selector='keySpecifier'>
-      <retval declared_type='NSScriptObjectSpecifier*' type='@'/>
-    </method>
-    <method selector='setReceiversSpecifier:'>
-      <arg name='receiversRef' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSSocketPort'>
-    <method selector='address'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initRemoteWithProtocolFamily:socketType:protocol:address:'>
-      <arg name='family' declared_type='int' type='i' index='0'/>
-      <arg name='type' declared_type='int' type='i' index='1'/>
-      <arg name='protocol' declared_type='int' type='i' index='2'/>
-      <arg name='address' declared_type='NSData*' type='@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initRemoteWithTCPPort:host:'>
-      <arg name='port' declared_type='unsigned short' type='S' index='0'/>
-      <arg name='hostName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithProtocolFamily:socketType:protocol:address:'>
-      <arg name='family' declared_type='int' type='i' index='0'/>
-      <arg name='type' declared_type='int' type='i' index='1'/>
-      <arg name='protocol' declared_type='int' type='i' index='2'/>
-      <arg name='address' declared_type='NSData*' type='@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithProtocolFamily:socketType:protocol:socket:'>
-      <arg name='family' declared_type='int' type='i' index='0'/>
-      <arg name='type' declared_type='int' type='i' index='1'/>
-      <arg name='protocol' declared_type='int' type='i' index='2'/>
-      <arg name='sock' declared_type='NSSocketNativeHandle' type='i' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithTCPPort:'>
-      <arg name='port' declared_type='unsigned short' type='S' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='protocol'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='protocolFamily'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='socket'>
-      <retval declared_type='NSSocketNativeHandle' type='i'/>
-    </method>
-    <method selector='socketType'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='NSSocketPortNameServer'>
-    <method selector='defaultNameServerPortNumber'>
-      <retval declared_type='uint16_t' type='S'/>
-    </method>
-    <method selector='portForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='portForName:host:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='host' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='portForName:host:nameServerPortNumber:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='host' declared_type='NSString*' type='@' index='1'/>
-      <arg name='portNumber' declared_type='uint16_t' type='S' index='2'/>
-      <retval declared_type='NSPort*' type='@'/>
-    </method>
-    <method selector='registerPort:name:'>
-      <arg name='port' declared_type='NSPort*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='registerPort:name:nameServerPortNumber:'>
-      <arg name='port' declared_type='NSPort*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <arg name='portNumber' declared_type='uint16_t' type='S' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='removePortForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setDefaultNameServerPortNumber:'>
-      <arg name='portNumber' declared_type='uint16_t' type='S' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedInstance'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSSortDescriptor'>
-    <method selector='ascending'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='compareObject:toObject:'>
-      <arg name='object1' declared_type='id' type='@' index='0'/>
-      <arg name='object2' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method selector='initWithKey:ascending:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='ascending' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithKey:ascending:selector:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='ascending' declared_type='BOOL' type='B' index='1'/>
-      <arg name='selector' declared_type='SEL' type=':' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='key'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='reversedSortDescriptor'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='selector'>
-      <retval declared_type='SEL' type=':'/>
-    </method>
-  </class>
-  <class name='NSSpecifierTest'>
-    <method selector='initWithObjectSpecifier:comparisonOperator:testObject:'>
-      <arg name='obj1' declared_type='NSScriptObjectSpecifier*' type='@' index='0'/>
-      <arg name='compOp' declared_type='NSTestComparisonOperation' type='I' type64='Q' index='1'/>
-      <arg name='obj2' declared_type='id' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSSpellServer'>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isWordInUserDictionaries:caseSensitive:'>
-      <arg name='word' declared_type='NSString*' type='@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='registerLanguage:byVendor:'>
-      <arg name='language' declared_type='NSString*' type='@' index='0'/>
-      <arg name='vendor' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='run'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSStream'>
-    <method selector='close'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='getStreamsToHost:port:inputStream:outputStream:'>
-      <arg name='host' declared_type='NSHost*' type='@' index='0'/>
-      <arg name='port' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='inputStream' declared_type='NSInputStream**' type='^@' index='2'/>
-      <arg name='outputStream' declared_type='NSOutputStream**' type='^@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='open'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='propertyForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='removeFromRunLoop:forMode:'>
-      <arg name='aRunLoop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scheduleInRunLoop:forMode:'>
-      <arg name='aRunLoop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setProperty:forKey:'>
-      <arg name='property' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='streamError'>
-      <retval declared_type='NSError*' type='@'/>
-    </method>
-    <method selector='streamStatus'>
-      <retval declared_type='NSStreamStatus' type='I' type64='Q'/>
-    </method>
-  </class>
-  <class name='NSString'>
-    <method selector='UTF8String'>
-      <retval declared_type='char*' type='*' const='true'/>
-    </method>
-    <method class_method='true' selector='availableStringEncodings'>
-      <retval declared_type='NSStringEncoding*' type='^I' type64='^Q' const='true'/>
-    </method>
-    <method selector='boolValue'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cString'>
-      <retval declared_type='char*' type='*' const='true'/>
-    </method>
-    <method selector='cStringLength'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='cStringUsingEncoding:'>
-      <arg name='encoding' declared_type='NSStringEncoding' type='I' type64='Q' index='0'/>
-      <retval declared_type='char*' type='*' const='true'/>
-    </method>
-    <method selector='canBeConvertedToEncoding:'>
-      <arg name='encoding' declared_type='NSStringEncoding' type='I' type64='Q' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='capitalizedString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='caseInsensitiveCompare:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method selector='characterAtIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='unichar' type='S'/>
-    </method>
-    <method selector='commonPrefixWithString:options:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSStringCompareOptions' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='compare:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method selector='compare:options:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSStringCompareOptions' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method selector='compare:options:range:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSStringCompareOptions' type='I' type64='Q' index='1'/>
-      <arg name='compareRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method selector='compare:options:range:locale:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSStringCompareOptions' type='I' type64='Q' index='1'/>
-      <arg name='compareRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <arg name='locale' declared_type='id' type='@' index='3'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method selector='completePathIntoString:caseSensitive:matchesIntoArray:filterTypes:'>
-      <arg name='outputName' declared_type='NSString**' type='^@' index='0'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='1'/>
-      <arg name='outputArray' declared_type='NSArray**' type='^@' index='2'/>
-      <arg name='filterTypes' declared_type='NSArray*' type='@' index='3'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='componentsSeparatedByCharactersInSet:'>
-      <arg name='separator' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='componentsSeparatedByString:'>
-      <arg name='separator' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='dataUsingEncoding:'>
-      <arg name='encoding' declared_type='NSStringEncoding' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='dataUsingEncoding:allowLossyConversion:'>
-      <arg name='encoding' declared_type='NSStringEncoding' type='I' type64='Q' index='0'/>
-      <arg name='lossy' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='decomposedStringWithCanonicalMapping'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='decomposedStringWithCompatibilityMapping'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='defaultCStringEncoding'>
-      <retval declared_type='NSStringEncoding' type='I' type64='Q'/>
-    </method>
-    <method selector='description'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='doubleValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='fastestEncoding'>
-      <retval declared_type='NSStringEncoding' type='I' type64='Q'/>
-    </method>
-    <method selector='fileSystemRepresentation'>
-      <retval declared_type='char*' type='*' const='true'/>
-    </method>
-    <method selector='floatValue'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='getBytes:maxLength:usedLength:encoding:options:range:remainingRange:'>
-      <arg name='buffer' declared_type='void*' type='^v' index='0'/>
-      <arg name='maxBufferCount' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='usedBufferCount' declared_type='NSUInteger*' type='^I' type64='^Q' index='2'/>
-      <arg name='encoding' declared_type='NSStringEncoding' type='I' type64='Q' index='3'/>
-      <arg name='options' declared_type='NSStringEncodingConversionOptions' type='I' type64='Q' index='4'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='5'/>
-      <arg name='leftover' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='6'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='getCString:'>
-      <arg name='bytes' declared_type='char*' type='*' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getCString:maxLength:'>
-      <arg name='bytes' declared_type='char*' type='*' index='0'/>
-      <arg name='maxLength' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getCString:maxLength:encoding:'>
-      <arg name='buffer' declared_type='char*' type='*' index='0'/>
-      <arg name='maxBufferCount' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='encoding' declared_type='NSStringEncoding' type='I' type64='Q' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='getCString:maxLength:range:remainingRange:'>
-      <arg name='bytes' declared_type='char*' type='*' index='0'/>
-      <arg name='maxLength' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='aRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <arg name='leftoverRange' declared_type='NSRangePointer' type='^{_NSRange=II}' type64='^{_NSRange=QQ}' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getCharacters:'>
-      <arg name='buffer' declared_type='unichar*' type='^S' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getCharacters:range:'>
-      <arg name='buffer' declared_type='unichar*' type='^S' index='0'/>
-      <arg name='aRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getFileSystemRepresentation:maxLength:'>
-      <arg name='cname' declared_type='char*' type='*' index='0'/>
-      <arg name='max' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='getLineStart:end:contentsEnd:forRange:'>
-      <arg name='startPtr' declared_type='NSUInteger*' type='^I' type64='^Q' index='0'/>
-      <arg name='lineEndPtr' declared_type='NSUInteger*' type='^I' type64='^Q' index='1'/>
-      <arg name='contentsEndPtr' declared_type='NSUInteger*' type='^I' type64='^Q' index='2'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getParagraphStart:end:contentsEnd:forRange:'>
-      <arg name='startPtr' declared_type='NSUInteger*' type='^I' type64='^Q' index='0'/>
-      <arg name='parEndPtr' declared_type='NSUInteger*' type='^I' type64='^Q' index='1'/>
-      <arg name='contentsEndPtr' declared_type='NSUInteger*' type='^I' type64='^Q' index='2'/>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='hasPrefix:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasSuffix:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hash'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithBytes:length:encoding:'>
-      <arg name='bytes' declared_type='void*' type='^v' const='true' index='0'/>
-      <arg name='len' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='encoding' declared_type='NSStringEncoding' type='I' type64='Q' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method ignore='true' suggestion='Call initWithBytes:length:encoding:.' selector='initWithBytesNoCopy:length:encoding:freeWhenDone:'>
-      <arg name='bytes' declared_type='void*' type='^v' index='0'/>
-      <arg name='len' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='encoding' declared_type='NSStringEncoding' type='I' type64='Q' index='2'/>
-      <arg name='freeBuffer' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithCString:'>
-      <arg name='bytes' declared_type='char*' type='*' const='true' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithCString:encoding:'>
-      <arg name='nullTerminatedCString' declared_type='char*' type='*' const='true' index='0'/>
-      <arg name='encoding' declared_type='NSStringEncoding' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithCString:length:'>
-      <arg name='bytes' declared_type='char*' type='*' const='true' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithCStringNoCopy:length:freeWhenDone:'>
-      <arg name='bytes' declared_type='char*' type='*' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='freeBuffer' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithCharacters:length:'>
-      <arg name='characters' declared_type='unichar*' type='^S' const='true' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method ignore='true' suggestion='Call initWithCharacters:length:.' selector='initWithCharactersNoCopy:length:freeWhenDone:'>
-      <arg name='characters' declared_type='unichar*' type='^S' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='freeBuffer' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfFile:encoding:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='enc' declared_type='NSStringEncoding' type='I' type64='Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfFile:usedEncoding:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='enc' declared_type='NSStringEncoding*' type='^I' type64='^Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:encoding:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='enc' declared_type='NSStringEncoding' type='I' type64='Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:usedEncoding:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='enc' declared_type='NSStringEncoding*' type='^I' type64='^Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:encoding:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='encoding' declared_type='NSStringEncoding' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method variadic='true' selector='initWithFormat:'>
-      <arg name='initWithFormat' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithFormat:arguments:'>
-      <arg name='format' declared_type='NSString*' type='@' index='0'/>
-      <arg name='argList' declared_type='va_list' type='*' type64='[1{?=II^v^v}]' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method variadic='true' selector='initWithFormat:locale:'>
-      <arg name='format' declared_type='NSString*' type='@' index='0'/>
-      <arg name='locale' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithFormat:locale:arguments:'>
-      <arg name='format' declared_type='NSString*' type='@' index='0'/>
-      <arg name='locale' declared_type='id' type='@' index='1'/>
-      <arg name='argList' declared_type='va_list' type='*' type64='[1{?=II^v^v}]' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithString:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithUTF8String:'>
-      <arg name='nullTerminatedCString' declared_type='char*' type='*' const='true' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='intValue'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='integerValue'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='isAbsolutePath'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEqualToString:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='lastPathComponent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='lengthOfBytesUsingEncoding:'>
-      <arg name='enc' declared_type='NSStringEncoding' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='lineRangeForRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='localizedCaseInsensitiveCompare:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method selector='localizedCompare:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSComparisonResult' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='localizedNameOfStringEncoding:'>
-      <arg name='encoding' declared_type='NSStringEncoding' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' variadic='true' selector='localizedStringWithFormat:'>
-      <arg name='localizedStringWithFormat' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='longLongValue'>
-      <retval declared_type='long long' type='q'/>
-    </method>
-    <method selector='lossyCString'>
-      <retval declared_type='char*' type='*' const='true'/>
-    </method>
-    <method selector='lowercaseString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='maximumLengthOfBytesUsingEncoding:'>
-      <arg name='enc' declared_type='NSStringEncoding' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='paragraphRangeForRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='pathComponents'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='pathExtension'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='pathWithComponents:'>
-      <arg name='components' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='precomposedStringWithCanonicalMapping'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='precomposedStringWithCompatibilityMapping'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='propertyList'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='propertyListFromStringsFileFormat'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='rangeOfCharacterFromSet:'>
-      <arg name='aSet' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeOfCharacterFromSet:options:'>
-      <arg name='aSet' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSStringCompareOptions' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeOfCharacterFromSet:options:range:'>
-      <arg name='aSet' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSStringCompareOptions' type='I' type64='Q' index='1'/>
-      <arg name='searchRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeOfComposedCharacterSequenceAtIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeOfComposedCharacterSequencesForRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeOfString:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeOfString:options:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSStringCompareOptions' type='I' type64='Q' index='1'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeOfString:options:range:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSStringCompareOptions' type='I' type64='Q' index='1'/>
-      <arg name='searchRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rangeOfString:options:range:locale:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSStringCompareOptions' type='I' type64='Q' index='1'/>
-      <arg name='searchRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='2'/>
-      <arg name='locale' declared_type='NSLocale*' type='@' index='3'/>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='smallestEncoding'>
-      <retval declared_type='NSStringEncoding' type='I' type64='Q'/>
-    </method>
-    <method class_method='true' selector='string'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='stringByAbbreviatingWithTildeInPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByAddingPercentEscapesUsingEncoding:'>
-      <arg name='enc' declared_type='NSStringEncoding' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method variadic='true' selector='stringByAppendingFormat:'>
-      <arg name='stringByAppendingFormat' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByAppendingPathComponent:'>
-      <arg name='str' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByAppendingPathExtension:'>
-      <arg name='str' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByAppendingString:'>
-      <arg name='aString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByDeletingLastPathComponent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByDeletingPathExtension'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByExpandingTildeInPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByFoldingWithOptions:locale:'>
-      <arg name='options' declared_type='NSStringCompareOptions' type='I' type64='Q' index='0'/>
-      <arg name='locale' declared_type='NSLocale*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByPaddingToLength:withString:startingAtIndex:'>
-      <arg name='newLength' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='padString' declared_type='NSString*' type='@' index='1'/>
-      <arg name='padIndex' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByReplacingCharactersInRange:withString:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <arg name='replacement' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByReplacingOccurrencesOfString:withString:'>
-      <arg name='target' declared_type='NSString*' type='@' index='0'/>
-      <arg name='replacement' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByReplacingOccurrencesOfString:withString:options:range:'>
-      <arg name='target' declared_type='NSString*' type='@' index='0'/>
-      <arg name='replacement' declared_type='NSString*' type='@' index='1'/>
-      <arg name='options' declared_type='NSStringCompareOptions' type='I' type64='Q' index='2'/>
-      <arg name='searchRange' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='3'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByReplacingPercentEscapesUsingEncoding:'>
-      <arg name='enc' declared_type='NSStringEncoding' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByResolvingSymlinksInPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByStandardizingPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stringByTrimmingCharactersInSet:'>
-      <arg name='set' declared_type='NSCharacterSet*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='stringWithCString:'>
-      <arg name='bytes' declared_type='char*' type='*' const='true' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='stringWithCString:encoding:'>
-      <arg name='cString' declared_type='char*' type='*' const='true' index='0'/>
-      <arg name='enc' declared_type='NSStringEncoding' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='stringWithCString:length:'>
-      <arg name='bytes' declared_type='char*' type='*' const='true' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='stringWithCharacters:length:'>
-      <arg name='characters' declared_type='unichar*' type='^S' const='true' index='0'/>
-      <arg name='length' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='stringWithContentsOfFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='stringWithContentsOfFile:encoding:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='enc' declared_type='NSStringEncoding' type='I' type64='Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='stringWithContentsOfFile:usedEncoding:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='enc' declared_type='NSStringEncoding*' type='^I' type64='^Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='stringWithContentsOfURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='stringWithContentsOfURL:encoding:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='enc' declared_type='NSStringEncoding' type='I' type64='Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='stringWithContentsOfURL:usedEncoding:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='enc' declared_type='NSStringEncoding*' type='^I' type64='^Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' variadic='true' selector='stringWithFormat:'>
-      <arg name='stringWithFormat' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='stringWithString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='stringWithUTF8String:'>
-      <arg name='nullTerminatedCString' declared_type='char*' type='*' const='true' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='stringsByAppendingPaths:'>
-      <arg name='paths' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='substringFromIndex:'>
-      <arg name='from' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='substringToIndex:'>
-      <arg name='to' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='substringWithRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='uppercaseString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='writeToFile:atomically:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='useAuxiliaryFile' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToFile:atomically:encoding:error:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='useAuxiliaryFile' declared_type='BOOL' type='B' index='1'/>
-      <arg name='enc' declared_type='NSStringEncoding' type='I' type64='Q' index='2'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToURL:atomically:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='atomically' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeToURL:atomically:encoding:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='useAuxiliaryFile' declared_type='BOOL' type='B' index='1'/>
-      <arg name='enc' declared_type='NSStringEncoding' type='I' type64='Q' index='2'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSTask'>
-    <method selector='arguments'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='currentDirectoryPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='environment'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='interrupt'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isRunning'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='launch'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='launchPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='launchedTaskWithLaunchPath:arguments:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='arguments' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='NSTask*' type='@'/>
-    </method>
-    <method selector='processIdentifier'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='resume'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setArguments:'>
-      <arg name='arguments' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCurrentDirectoryPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEnvironment:'>
-      <arg name='dict' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLaunchPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStandardError:'>
-      <arg name='error' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStandardInput:'>
-      <arg name='input' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStandardOutput:'>
-      <arg name='output' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='standardError'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='standardInput'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='standardOutput'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='suspend'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='terminate'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='terminationStatus'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='waitUntilExit'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSThread'>
-    <method class_method='true' selector='callStackReturnAddresses'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='cancel'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='currentThread'>
-      <retval declared_type='NSThread*' type='@'/>
-    </method>
-    <method class_method='true' selector='detachNewThreadSelector:toTarget:withObject:'>
-      <arg name='selector' declared_type='SEL' type=':' index='0'/>
-      <arg name='target' declared_type='id' type='@' index='1'/>
-      <arg name='argument' declared_type='id' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='exit'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithTarget:selector:object:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <arg name='selector' declared_type='SEL' type=':' index='1'/>
-      <arg name='argument' declared_type='id' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isCancelled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isExecuting'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isFinished'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='isMainThread'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isMainThread'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='isMultiThreaded'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='main'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='mainThread'>
-      <retval declared_type='NSThread*' type='@'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setName:'>
-      <arg name='n' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStackSize:'>
-      <arg name='s' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setThreadPriority:'>
-      <arg name='p' declared_type='double' type='d' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='sleepForTimeInterval:'>
-      <arg name='ti' declared_type='NSTimeInterval' type='d' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sleepUntilDate:'>
-      <arg name='date' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stackSize'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='start'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='threadDictionary'>
-      <retval declared_type='NSMutableDictionary*' type='@'/>
-    </method>
-    <method class_method='true' selector='threadPriority'>
-      <retval declared_type='double' type='d'/>
-    </method>
-  </class>
-  <class name='NSTimeZone'>
-    <method selector='abbreviation'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='abbreviationDictionary'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='abbreviationForDate:'>
-      <arg name='aDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='data'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='daylightSavingTimeOffset'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='daylightSavingTimeOffsetForDate:'>
-      <arg name='aDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method class_method='true' selector='defaultTimeZone'>
-      <retval declared_type='NSTimeZone*' type='@'/>
-    </method>
-    <method selector='description'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='initWithName:'>
-      <arg name='tzName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithName:data:'>
-      <arg name='tzName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='aData' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isDaylightSavingTime'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isDaylightSavingTimeForDate:'>
-      <arg name='aDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEqualToTimeZone:'>
-      <arg name='aTimeZone' declared_type='NSTimeZone*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='knownTimeZoneNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='localTimeZone'>
-      <retval declared_type='NSTimeZone*' type='@'/>
-    </method>
-    <method selector='localizedName:locale:'>
-      <arg name='style' declared_type='NSTimeZoneNameStyle' type='i' type64='q' index='0'/>
-      <arg name='locale' declared_type='NSLocale*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='nextDaylightSavingTimeTransition'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='nextDaylightSavingTimeTransitionAfterDate:'>
-      <arg name='aDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method class_method='true' selector='resetSystemTimeZone'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='secondsFromGMT'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='secondsFromGMTForDate:'>
-      <arg name='aDate' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method class_method='true' selector='setDefaultTimeZone:'>
-      <arg name='aTimeZone' declared_type='NSTimeZone*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='systemTimeZone'>
-      <retval declared_type='NSTimeZone*' type='@'/>
-    </method>
-    <method class_method='true' selector='timeZoneForSecondsFromGMT:'>
-      <arg name='seconds' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='timeZoneWithAbbreviation:'>
-      <arg name='abbreviation' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='timeZoneWithName:'>
-      <arg name='tzName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='timeZoneWithName:data:'>
-      <arg name='tzName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='aData' declared_type='NSData*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSTimer'>
-    <method selector='fire'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='fireDate'>
-      <retval declared_type='NSDate*' type='@'/>
-    </method>
-    <method selector='initWithFireDate:interval:target:selector:userInfo:repeats:'>
-      <arg name='date' declared_type='NSDate*' type='@' index='0'/>
-      <arg name='ti' declared_type='NSTimeInterval' type='d' index='1'/>
-      <arg name='t' declared_type='id' type='@' index='2'/>
-      <arg name='s' declared_type='SEL' type=':' index='3'/>
-      <arg name='ui' declared_type='id' type='@' index='4'/>
-      <arg name='rep' declared_type='BOOL' type='B' index='5'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='invalidate'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isValid'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='scheduledTimerWithTimeInterval:invocation:repeats:'>
-      <arg name='ti' declared_type='NSTimeInterval' type='d' index='0'/>
-      <arg name='invocation' declared_type='NSInvocation*' type='@' index='1'/>
-      <arg name='yesOrNo' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='NSTimer*' type='@'/>
-    </method>
-    <method class_method='true' selector='scheduledTimerWithTimeInterval:target:selector:userInfo:repeats:'>
-      <arg name='ti' declared_type='NSTimeInterval' type='d' index='0'/>
-      <arg name='aTarget' declared_type='id' type='@' index='1'/>
-      <arg name='aSelector' declared_type='SEL' type=':' index='2'/>
-      <arg name='userInfo' declared_type='id' type='@' index='3'/>
-      <arg name='yesOrNo' declared_type='BOOL' type='B' index='4'/>
-      <retval declared_type='NSTimer*' type='@'/>
-    </method>
-    <method selector='setFireDate:'>
-      <arg name='date' declared_type='NSDate*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='timeInterval'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method class_method='true' selector='timerWithTimeInterval:invocation:repeats:'>
-      <arg name='ti' declared_type='NSTimeInterval' type='d' index='0'/>
-      <arg name='invocation' declared_type='NSInvocation*' type='@' index='1'/>
-      <arg name='yesOrNo' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='NSTimer*' type='@'/>
-    </method>
-    <method class_method='true' selector='timerWithTimeInterval:target:selector:userInfo:repeats:'>
-      <arg name='ti' declared_type='NSTimeInterval' type='d' index='0'/>
-      <arg name='aTarget' declared_type='id' type='@' index='1'/>
-      <arg name='aSelector' declared_type='SEL' type=':' index='2'/>
-      <arg name='userInfo' declared_type='id' type='@' index='3'/>
-      <arg name='yesOrNo' declared_type='BOOL' type='B' index='4'/>
-      <retval declared_type='NSTimer*' type='@'/>
-    </method>
-    <method selector='userInfo'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSURL'>
-    <method selector='URLHandleUsingCache:'>
-      <arg name='shouldUseCache' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='NSURLHandle*' type='@'/>
-    </method>
-    <method class_method='true' selector='URLWithString:'>
-      <arg name='URLString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='URLWithString:relativeToURL:'>
-      <arg name='URLString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='baseURL' declared_type='NSURL*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='absoluteString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='absoluteURL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='baseURL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method class_method='true' selector='fileURLWithPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='fileURLWithPath:isDirectory:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='isDir' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='fragment'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='host'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='initFileURLWithPath:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initFileURLWithPath:isDirectory:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='isDir' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithScheme:host:path:'>
-      <arg name='scheme' declared_type='NSString*' type='@' index='0'/>
-      <arg name='host' declared_type='NSString*' type='@' index='1'/>
-      <arg name='path' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithString:'>
-      <arg name='URLString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithString:relativeToURL:'>
-      <arg name='URLString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='baseURL' declared_type='NSURL*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isFileURL'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='loadResourceDataNotifyingClient:usingCache:'>
-      <arg name='client' declared_type='id' type='@' index='0'/>
-      <arg name='shouldUseCache' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='parameterString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='password'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='path'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='port'>
-      <retval declared_type='NSNumber*' type='@'/>
-    </method>
-    <method selector='propertyForKey:'>
-      <arg name='propertyKey' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='query'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='relativePath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='relativeString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='resourceDataUsingCache:'>
-      <arg name='shouldUseCache' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='resourceSpecifier'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='scheme'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setProperty:forKey:'>
-      <arg name='property' declared_type='id' type='@' index='0'/>
-      <arg name='propertyKey' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setResourceData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='standardizedURL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='user'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSURLAuthenticationChallenge'>
-    <method selector='error'>
-      <retval declared_type='NSError*' type='@'/>
-    </method>
-    <method selector='failureResponse'>
-      <retval declared_type='NSURLResponse*' type='@'/>
-    </method>
-    <method selector='initWithAuthenticationChallenge:sender:'>
-      <arg name='challenge' declared_type='NSURLAuthenticationChallenge*' type='@' index='0'/>
-      <arg name='sender' declared_type='id&lt;NSURLAuthenticationChallengeSender&gt;' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithProtectionSpace:proposedCredential:previousFailureCount:failureResponse:error:sender:'>
-      <arg name='space' declared_type='NSURLProtectionSpace*' type='@' index='0'/>
-      <arg name='credential' declared_type='NSURLCredential*' type='@' index='1'/>
-      <arg name='previousFailureCount' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='response' declared_type='NSURLResponse*' type='@' index='3'/>
-      <arg name='error' declared_type='NSError*' type='@' index='4'/>
-      <arg name='sender' declared_type='id&lt;NSURLAuthenticationChallengeSender&gt;' type='@' index='5'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='previousFailureCount'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='proposedCredential'>
-      <retval declared_type='NSURLCredential*' type='@'/>
-    </method>
-    <method selector='protectionSpace'>
-      <retval declared_type='NSURLProtectionSpace*' type='@'/>
-    </method>
-    <method selector='sender'>
-      <retval declared_type='id&lt;NSURLAuthenticationChallengeSender&gt;' type='@'/>
-    </method>
-  </class>
-  <class name='NSURLCache'>
-    <method selector='cachedResponseForRequest:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <retval declared_type='NSCachedURLResponse*' type='@'/>
-    </method>
-    <method selector='currentDiskUsage'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='currentMemoryUsage'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='diskCapacity'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='initWithMemoryCapacity:diskCapacity:diskPath:'>
-      <arg name='memoryCapacity' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='diskCapacity' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='path' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='memoryCapacity'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='removeAllCachedResponses'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeCachedResponseForRequest:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDiskCapacity:'>
-      <arg name='diskCapacity' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMemoryCapacity:'>
-      <arg name='memoryCapacity' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setSharedURLCache:'>
-      <arg name='cache' declared_type='NSURLCache*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedURLCache'>
-      <retval declared_type='NSURLCache*' type='@'/>
-    </method>
-    <method selector='storeCachedResponse:forRequest:'>
-      <arg name='cachedResponse' declared_type='NSCachedURLResponse*' type='@' index='0'/>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSURLConnection'>
-    <method class_method='true' selector='canHandleRequest:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cancel'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='connectionWithRequest:delegate:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <arg name='delegate' declared_type='id' type='@' index='1'/>
-      <retval declared_type='NSURLConnection*' type='@'/>
-    </method>
-    <method selector='initWithRequest:delegate:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <arg name='delegate' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithRequest:delegate:startImmediately:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <arg name='delegate' declared_type='id' type='@' index='1'/>
-      <arg name='startImmediately' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='scheduleInRunLoop:forMode:'>
-      <arg name='aRunLoop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sendSynchronousRequest:returningResponse:error:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <arg name='response' declared_type='NSURLResponse**' type='^@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='start'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='unscheduleFromRunLoop:forMode:'>
-      <arg name='aRunLoop' declared_type='NSRunLoop*' type='@' index='0'/>
-      <arg name='mode' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSURLCredential'>
-    <method class_method='true' selector='credentialWithUser:password:persistence:'>
-      <arg name='user' declared_type='NSString*' type='@' index='0'/>
-      <arg name='password' declared_type='NSString*' type='@' index='1'/>
-      <arg name='persistence' declared_type='NSURLCredentialPersistence' type='I' type64='Q' index='2'/>
-      <retval declared_type='NSURLCredential*' type='@'/>
-    </method>
-    <method selector='hasPassword'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initWithUser:password:persistence:'>
-      <arg name='user' declared_type='NSString*' type='@' index='0'/>
-      <arg name='password' declared_type='NSString*' type='@' index='1'/>
-      <arg name='persistence' declared_type='NSURLCredentialPersistence' type='I' type64='Q' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='password'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='persistence'>
-      <retval declared_type='NSURLCredentialPersistence' type='I' type64='Q'/>
-    </method>
-    <method selector='user'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSURLCredentialStorage'>
-    <method selector='allCredentials'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='credentialsForProtectionSpace:'>
-      <arg name='space' declared_type='NSURLProtectionSpace*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='defaultCredentialForProtectionSpace:'>
-      <arg name='space' declared_type='NSURLProtectionSpace*' type='@' index='0'/>
-      <retval declared_type='NSURLCredential*' type='@'/>
-    </method>
-    <method selector='removeCredential:forProtectionSpace:'>
-      <arg name='credential' declared_type='NSURLCredential*' type='@' index='0'/>
-      <arg name='space' declared_type='NSURLProtectionSpace*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCredential:forProtectionSpace:'>
-      <arg name='credential' declared_type='NSURLCredential*' type='@' index='0'/>
-      <arg name='space' declared_type='NSURLProtectionSpace*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDefaultCredential:forProtectionSpace:'>
-      <arg name='credential' declared_type='NSURLCredential*' type='@' index='0'/>
-      <arg name='space' declared_type='NSURLProtectionSpace*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='sharedCredentialStorage'>
-      <retval declared_type='NSURLCredentialStorage*' type='@'/>
-    </method>
-  </class>
-  <class name='NSURLDownload'>
-    <method class_method='true' selector='canResumeDownloadDecodedWithEncodingMIMEType:'>
-      <arg name='MIMEType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cancel'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deletesFileUponFailure'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initWithRequest:delegate:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <arg name='delegate' declared_type='id' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithResumeData:delegate:path:'>
-      <arg name='resumeData' declared_type='NSData*' type='@' index='0'/>
-      <arg name='delegate' declared_type='id' type='@' index='1'/>
-      <arg name='path' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='request'>
-      <retval declared_type='NSURLRequest*' type='@'/>
-    </method>
-    <method selector='resumeData'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='setDeletesFileUponFailure:'>
-      <arg name='deletesFileUponFailure' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDestination:allowOverwrite:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <arg name='allowOverwrite' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSURLHandle'>
-    <method class_method='true' selector='URLHandleClassForURL:'>
-      <arg name='anURL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='addClient:'>
-      <arg name='client' declared_type='id &lt;NSURLHandleClient&gt;' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='availableResourceData'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='backgroundLoadDidFailWithReason:'>
-      <arg name='reason' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='beginLoadInBackground'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='cachedHandleForURL:'>
-      <arg name='anURL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='NSURLHandle*' type='@'/>
-    </method>
-    <method class_method='true' selector='canInitWithURL:'>
-      <arg name='anURL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cancelLoadInBackground'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='didLoadBytes:loadComplete:'>
-      <arg name='newBytes' declared_type='NSData*' type='@' index='0'/>
-      <arg name='yorn' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='endLoadInBackground'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='expectedResourceDataSize'>
-      <retval declared_type='long long' type='q'/>
-    </method>
-    <method selector='failureReason'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='flushCachedData'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithURL:cached:'>
-      <arg name='anURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='willCache' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='loadInBackground'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='loadInForeground'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='propertyForKey:'>
-      <arg name='propertyKey' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='propertyForKeyIfAvailable:'>
-      <arg name='propertyKey' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='registerURLHandleClass:'>
-      <arg name='anURLHandleSubclass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeClient:'>
-      <arg name='client' declared_type='id &lt;NSURLHandleClient&gt;' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resourceData'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='status'>
-      <retval declared_type='NSURLHandleStatus' type='I' type64='Q'/>
-    </method>
-    <method selector='writeData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='writeProperty:forKey:'>
-      <arg name='propertyValue' declared_type='id' type='@' index='0'/>
-      <arg name='propertyKey' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSURLProtectionSpace'>
-    <method selector='authenticationMethod'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='host'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='initWithHost:port:protocol:realm:authenticationMethod:'>
-      <arg name='host' declared_type='NSString*' type='@' index='0'/>
-      <arg name='port' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='protocol' declared_type='NSString*' type='@' index='2'/>
-      <arg name='realm' declared_type='NSString*' type='@' index='3'/>
-      <arg name='authenticationMethod' declared_type='NSString*' type='@' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithProxyHost:port:type:realm:authenticationMethod:'>
-      <arg name='host' declared_type='NSString*' type='@' index='0'/>
-      <arg name='port' declared_type='NSInteger' type='i' type64='q' index='1'/>
-      <arg name='type' declared_type='NSString*' type='@' index='2'/>
-      <arg name='realm' declared_type='NSString*' type='@' index='3'/>
-      <arg name='authenticationMethod' declared_type='NSString*' type='@' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isProxy'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='port'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='protocol'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='proxyType'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='realm'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='receivesCredentialSecurely'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='NSURLProtocol'>
-    <method selector='cachedResponse'>
-      <retval declared_type='NSCachedURLResponse*' type='@'/>
-    </method>
-    <method class_method='true' selector='canInitWithRequest:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='canonicalRequestForRequest:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <retval declared_type='NSURLRequest*' type='@'/>
-    </method>
-    <method selector='client'>
-      <retval declared_type='id &lt;NSURLProtocolClient&gt;' type='@'/>
-    </method>
-    <method selector='initWithRequest:cachedResponse:client:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <arg name='cachedResponse' declared_type='NSCachedURLResponse*' type='@' index='1'/>
-      <arg name='client' declared_type='id &lt;NSURLProtocolClient&gt;' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='propertyForKey:inRequest:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='registerClass:'>
-      <arg name='protocolClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='removePropertyForKey:inRequest:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='request' declared_type='NSMutableURLRequest*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='request'>
-      <retval declared_type='NSURLRequest*' type='@'/>
-    </method>
-    <method class_method='true' selector='requestIsCacheEquivalent:toRequest:'>
-      <arg name='a' declared_type='NSURLRequest*' type='@' index='0'/>
-      <arg name='b' declared_type='NSURLRequest*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='setProperty:forKey:inRequest:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='key' declared_type='NSString*' type='@' index='1'/>
-      <arg name='request' declared_type='NSMutableURLRequest*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='startLoading'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopLoading'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='unregisterClass:'>
-      <arg name='protocolClass' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSURLRequest'>
-    <method selector='HTTPBody'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='HTTPBodyStream'>
-      <retval declared_type='NSInputStream*' type='@'/>
-    </method>
-    <method selector='HTTPMethod'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='HTTPShouldHandleCookies'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='URL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='allHTTPHeaderFields'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='cachePolicy'>
-      <retval declared_type='NSURLRequestCachePolicy' type='I' type64='Q'/>
-    </method>
-    <method selector='initWithURL:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithURL:cachePolicy:timeoutInterval:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='cachePolicy' declared_type='NSURLRequestCachePolicy' type='I' type64='Q' index='1'/>
-      <arg name='timeoutInterval' declared_type='NSTimeInterval' type='d' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='mainDocumentURL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method class_method='true' selector='requestWithURL:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='requestWithURL:cachePolicy:timeoutInterval:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='cachePolicy' declared_type='NSURLRequestCachePolicy' type='I' type64='Q' index='1'/>
-      <arg name='timeoutInterval' declared_type='NSTimeInterval' type='d' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='timeoutInterval'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='valueForHTTPHeaderField:'>
-      <arg name='field' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSURLResponse'>
-    <method selector='MIMEType'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='URL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='expectedContentLength'>
-      <retval declared_type='long long' type='q'/>
-    </method>
-    <method selector='initWithURL:MIMEType:expectedContentLength:textEncodingName:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='MIMEType' declared_type='NSString*' type='@' index='1'/>
-      <arg name='length' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='name' declared_type='NSString*' type='@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='suggestedFilename'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='textEncodingName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSUnarchiver'>
-    <method class_method='true' selector='classNameDecodedForArchiveClassName:'>
-      <arg name='inArchiveName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='classNameDecodedForArchiveClassName:'>
-      <arg name='inArchiveName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='decodeClassName:asClassName:'>
-      <arg name='inArchiveName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='trueName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='decodeClassName:asClassName:'>
-      <arg name='inArchiveName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='trueName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initForReadingWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isAtEnd'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='objectZone'>
-      <retval declared_type='NSZone*' type='^{_NSZone=}'/>
-    </method>
-    <method selector='replaceObject:withObject:'>
-      <arg name='object' declared_type='id' type='@' index='0'/>
-      <arg name='newObject' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObjectZone:'>
-      <arg name='zone' declared_type='NSZone*' type='^{_NSZone=}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='systemVersion'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-    <method class_method='true' selector='unarchiveObjectWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='unarchiveObjectWithFile:'>
-      <arg name='path' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSUndoManager'>
-    <method selector='beginUndoGrouping'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='canRedo'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canUndo'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='disableUndoRegistration'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='enableUndoRegistration'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='endUndoGrouping'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='groupingLevel'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='groupsByEvent'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isRedoing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isUndoRegistrationEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isUndoing'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='levelsOfUndo'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='prepareWithInvocationTarget:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='redo'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='redoActionName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='redoMenuItemTitle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='redoMenuTitleForUndoActionName:'>
-      <arg name='actionName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='registerUndoWithTarget:selector:object:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <arg name='selector' declared_type='SEL' type=':' index='1'/>
-      <arg name='anObject' declared_type='id' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAllActions'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAllActionsWithTarget:'>
-      <arg name='target' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='runLoopModes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='setActionName:'>
-      <arg name='actionName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGroupsByEvent:'>
-      <arg name='groupsByEvent' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLevelsOfUndo:'>
-      <arg name='levels' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRunLoopModes:'>
-      <arg name='runLoopModes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='undo'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='undoActionName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='undoMenuItemTitle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='undoMenuTitleForUndoActionName:'>
-      <arg name='actionName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='undoNestedGroup'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSUniqueIDSpecifier'>
-    <method selector='initWithContainerClassDescription:containerSpecifier:key:uniqueID:'>
-      <arg name='classDesc' declared_type='NSScriptClassDescription*' type='@' index='0'/>
-      <arg name='container' declared_type='NSScriptObjectSpecifier*' type='@' index='1'/>
-      <arg name='property' declared_type='NSString*' type='@' index='2'/>
-      <arg name='uniqueID' declared_type='id' type='@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setUniqueID:'>
-      <arg name='uniqueID' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='uniqueID'>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSUserDefaults'>
-    <method selector='addSuiteNamed:'>
-      <arg name='suiteName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='arrayForKey:'>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='boolForKey:'>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='dataForKey:'>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='dictionaryForKey:'>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='dictionaryRepresentation'>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='doubleForKey:'>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='floatForKey:'>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='init'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithUser:'>
-      <arg name='username' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='integerForKey:'>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='objectForKey:'>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectIsForcedForKey:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='objectIsForcedForKey:inDomain:'>
-      <arg name='key' declared_type='NSString*' type='@' index='0'/>
-      <arg name='domain' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='persistentDomainForName:'>
-      <arg name='domainName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='persistentDomainNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='registerDefaults:'>
-      <arg name='registrationDictionary' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeObjectForKey:'>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removePersistentDomainForName:'>
-      <arg name='domainName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeSuiteNamed:'>
-      <arg name='suiteName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeVolatileDomainForName:'>
-      <arg name='domainName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='resetStandardUserDefaults'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBool:forKey:'>
-      <arg name='value' declared_type='BOOL' type='B' index='0'/>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDouble:forKey:'>
-      <arg name='value' declared_type='double' type='d' index='0'/>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFloat:forKey:'>
-      <arg name='value' declared_type='float' type='f' index='0'/>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setInteger:forKey:'>
-      <arg name='value' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObject:forKey:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPersistentDomain:forName:'>
-      <arg name='domain' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='domainName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVolatileDomain:forName:'>
-      <arg name='domain' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='domainName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='standardUserDefaults'>
-      <retval declared_type='NSUserDefaults*' type='@'/>
-    </method>
-    <method selector='stringArrayForKey:'>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='stringForKey:'>
-      <arg name='defaultName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='synchronize'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='volatileDomainForName:'>
-      <arg name='domainName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='volatileDomainNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSValue'>
-    <method selector='getValue:'>
-      <arg name='value' declared_type='void*' type='^v' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initWithBytes:objCType:'>
-      <arg name='value' declared_type='void*' type='^v' const='true' index='0'/>
-      <arg name='type' declared_type='char*' type='*' const='true' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isEqualToValue:'>
-      <arg name='value' declared_type='NSValue*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='nonretainedObjectValue'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objCType'>
-      <retval declared_type='char*' type='*' const='true'/>
-    </method>
-    <method selector='pointValue'>
-      <retval declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}'/>
-    </method>
-    <method selector='pointerValue'>
-      <retval declared_type='void*' type='^v'/>
-    </method>
-    <method selector='rangeValue'>
-      <retval declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}'/>
-    </method>
-    <method selector='rectValue'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='sizeValue'>
-      <retval declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
-    </method>
-    <method class_method='true' selector='value:withObjCType:'>
-      <arg name='value' declared_type='void*' type='^v' const='true' index='0'/>
-      <arg name='type' declared_type='char*' type='*' const='true' index='1'/>
-      <retval declared_type='NSValue*' type='@'/>
-    </method>
-    <method class_method='true' selector='valueWithBytes:objCType:'>
-      <arg name='value' declared_type='void*' type='^v' const='true' index='0'/>
-      <arg name='type' declared_type='char*' type='*' const='true' index='1'/>
-      <retval declared_type='NSValue*' type='@'/>
-    </method>
-    <method class_method='true' selector='valueWithNonretainedObject:'>
-      <arg name='anObject' declared_type='id' type='@' index='0'/>
-      <retval declared_type='NSValue*' type='@'/>
-    </method>
-    <method class_method='true' selector='valueWithPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSValue*' type='@'/>
-    </method>
-    <method class_method='true' selector='valueWithPointer:'>
-      <arg name='pointer' declared_type='void*' type='^v' const='true' index='0'/>
-      <retval declared_type='NSValue*' type='@'/>
-    </method>
-    <method class_method='true' selector='valueWithRange:'>
-      <arg name='range' declared_type='NSRange' type='{_NSRange=II}' type64='{_NSRange=QQ}' index='0'/>
-      <retval declared_type='NSValue*' type='@'/>
-    </method>
-    <method class_method='true' selector='valueWithRect:'>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <retval declared_type='NSValue*' type='@'/>
-    </method>
-    <method class_method='true' selector='valueWithSize:'>
-      <arg name='size' declared_type='NSSize' type='{_NSSize=ff}' type64='{CGSize=dd}' index='0'/>
-      <retval declared_type='NSValue*' type='@'/>
-    </method>
-  </class>
-  <class name='NSValueTransformer'>
-    <method class_method='true' selector='allowsReverseTransformation'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='reverseTransformedValue:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='setValueTransformer:forName:'>
-      <arg name='transformer' declared_type='NSValueTransformer*' type='@' index='0'/>
-      <arg name='name' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='transformedValue:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='transformedValueClass'>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method class_method='true' selector='valueTransformerForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSValueTransformer*' type='@'/>
-    </method>
-    <method class_method='true' selector='valueTransformerNames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='NSWhoseSpecifier'>
-    <method selector='endSubelementIdentifier'>
-      <retval declared_type='NSWhoseSubelementIdentifier' type='I' type64='Q'/>
-    </method>
-    <method selector='endSubelementIndex'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='initWithContainerClassDescription:containerSpecifier:key:test:'>
-      <arg name='classDesc' declared_type='NSScriptClassDescription*' type='@' index='0'/>
-      <arg name='container' declared_type='NSScriptObjectSpecifier*' type='@' index='1'/>
-      <arg name='property' declared_type='NSString*' type='@' index='2'/>
-      <arg name='test' declared_type='NSScriptWhoseTest*' type='@' index='3'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='setEndSubelementIdentifier:'>
-      <arg name='subelement' declared_type='NSWhoseSubelementIdentifier' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEndSubelementIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStartSubelementIdentifier:'>
-      <arg name='subelement' declared_type='NSWhoseSubelementIdentifier' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStartSubelementIndex:'>
-      <arg name='index' declared_type='NSInteger' type='i' type64='q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTest:'>
-      <arg name='test' declared_type='NSScriptWhoseTest*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='startSubelementIdentifier'>
-      <retval declared_type='NSWhoseSubelementIdentifier' type='I' type64='Q'/>
-    </method>
-    <method selector='startSubelementIndex'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='test'>
-      <retval declared_type='NSScriptWhoseTest*' type='@'/>
-    </method>
-  </class>
-  <class name='NSXMLDTD'>
-    <method selector='addChild:'>
-      <arg name='child' declared_type='NSXMLNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='attributeDeclarationForName:elementName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='elementName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSXMLDTDNode*' type='@'/>
-    </method>
-    <method selector='elementDeclarationForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSXMLDTDNode*' type='@'/>
-    </method>
-    <method selector='entityDeclarationForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSXMLDTDNode*' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:options:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:options:error:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertChild:atIndex:'>
-      <arg name='child' declared_type='NSXMLNode*' type='@' index='0'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertChildren:atIndex:'>
-      <arg name='children' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='notationDeclarationForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSXMLDTDNode*' type='@'/>
-    </method>
-    <method class_method='true' selector='predefinedEntityDeclarationForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSXMLDTDNode*' type='@'/>
-    </method>
-    <method selector='publicID'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='removeChildAtIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceChildAtIndex:withNode:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='node' declared_type='NSXMLNode*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setChildren:'>
-      <arg name='children' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPublicID:'>
-      <arg name='publicID' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSystemID:'>
-      <arg name='systemID' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='systemID'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSXMLDTDNode'>
-    <method selector='DTDKind'>
-      <retval declared_type='NSXMLDTDNodeKind' type='I' type64='Q'/>
-    </method>
-    <method selector='initWithXMLString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isExternal'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='notationName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='publicID'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setDTDKind:'>
-      <arg name='kind' declared_type='NSXMLDTDNodeKind' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNotationName:'>
-      <arg name='notationName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPublicID:'>
-      <arg name='publicID' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSystemID:'>
-      <arg name='systemID' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='systemID'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSXMLDocument'>
-    <method selector='DTD'>
-      <retval declared_type='NSXMLDTD*' type='@'/>
-    </method>
-    <method selector='MIMEType'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='XMLData'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='XMLDataWithOptions:'>
-      <arg name='options' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='addChild:'>
-      <arg name='child' declared_type='NSXMLNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='characterEncoding'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='documentContentKind'>
-      <retval declared_type='NSXMLDocumentContentKind' type='I' type64='Q'/>
-    </method>
-    <method selector='initWithContentsOfURL:options:error:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:options:error:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithRootElement:'>
-      <arg name='element' declared_type='NSXMLElement*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithXMLString:options:error:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='mask' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertChild:atIndex:'>
-      <arg name='child' declared_type='NSXMLNode*' type='@' index='0'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertChildren:atIndex:'>
-      <arg name='children' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='isStandalone'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='objectByApplyingXSLT:arguments:error:'>
-      <arg name='xslt' declared_type='NSData*' type='@' index='0'/>
-      <arg name='arguments' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectByApplyingXSLTAtURL:arguments:error:'>
-      <arg name='xsltURL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='argument' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectByApplyingXSLTString:arguments:error:'>
-      <arg name='xslt' declared_type='NSString*' type='@' index='0'/>
-      <arg name='arguments' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='removeChildAtIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceChildAtIndex:withNode:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='node' declared_type='NSXMLNode*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='replacementClassForClass:'>
-      <arg name='cls' declared_type='Class' type='#' index='0'/>
-      <retval declared_type='Class' type='#'/>
-    </method>
-    <method selector='rootElement'>
-      <retval declared_type='NSXMLElement*' type='@'/>
-    </method>
-    <method selector='setCharacterEncoding:'>
-      <arg name='encoding' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setChildren:'>
-      <arg name='children' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDTD:'>
-      <arg name='documentTypeDeclaration' declared_type='NSXMLDTD*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDocumentContentKind:'>
-      <arg name='kind' declared_type='NSXMLDocumentContentKind' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMIMEType:'>
-      <arg name='MIMEType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRootElement:'>
-      <arg name='root' declared_type='NSXMLNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStandalone:'>
-      <arg name='standalone' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVersion:'>
-      <arg name='version' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='validateAndReturnError:'>
-      <arg name='error' declared_type='NSError**' type='^@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='version'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='NSXMLElement'>
-    <method selector='addAttribute:'>
-      <arg name='attribute' declared_type='NSXMLNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addChild:'>
-      <arg name='child' declared_type='NSXMLNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addNamespace:'>
-      <arg name='aNamespace' declared_type='NSXMLNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='attributeForLocalName:URI:'>
-      <arg name='localName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='URI' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSXMLNode*' type='@'/>
-    </method>
-    <method selector='attributeForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSXMLNode*' type='@'/>
-    </method>
-    <method selector='attributes'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='elementsForLocalName:URI:'>
-      <arg name='localName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='URI' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='elementsForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='initWithName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithName:URI:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='URI' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithName:stringValue:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='string' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithXMLString:error:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='insertChild:atIndex:'>
-      <arg name='child' declared_type='NSXMLNode*' type='@' index='0'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertChildren:atIndex:'>
-      <arg name='children' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='namespaceForPrefix:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSXMLNode*' type='@'/>
-    </method>
-    <method selector='namespaces'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='normalizeAdjacentTextNodesPreservingCDATA:'>
-      <arg name='preserve' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAttributeForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeChildAtIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeNamespaceForPrefix:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceChildAtIndex:withNode:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <arg name='node' declared_type='NSXMLNode*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resolveNamespaceForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSXMLNode*' type='@'/>
-    </method>
-    <method selector='resolvePrefixForNamespaceURI:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setAttributes:'>
-      <arg name='attributes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributesAsDictionary:'>
-      <arg name='attributes' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setChildren:'>
-      <arg name='children' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNamespaces:'>
-      <arg name='namespaces' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='NSXMLNode'>
-    <method class_method='true' selector='DTDNodeWithXMLString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='URI'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='XMLString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='XMLStringWithOptions:'>
-      <arg name='options' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='XPath'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='attributeWithName:URI:stringValue:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='URI' declared_type='NSString*' type='@' index='1'/>
-      <arg name='stringValue' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='attributeWithName:stringValue:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='stringValue' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='canonicalXMLStringPreservingComments:'>
-      <arg name='comments' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='childAtIndex:'>
-      <arg name='index' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='NSXMLNode*' type='@'/>
-    </method>
-    <method selector='childCount'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='children'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method class_method='true' selector='commentWithStringValue:'>
-      <arg name='stringValue' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='description'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='detach'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='document'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='documentWithRootElement:'>
-      <arg name='element' declared_type='NSXMLElement*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='elementWithName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='elementWithName:URI:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='URI' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='elementWithName:children:attributes:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='children' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='attributes' declared_type='NSArray*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='elementWithName:stringValue:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='string' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='index'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='initWithKind:'>
-      <arg name='kind' declared_type='NSXMLNodeKind' type='I' type64='Q' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithKind:options:'>
-      <arg name='kind' declared_type='NSXMLNodeKind' type='I' type64='Q' index='0'/>
-      <arg name='options' declared_type='NSUInteger' type='I' type64='Q' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='kind'>
-      <retval declared_type='NSXMLNodeKind' type='I' type64='Q'/>
-    </method>
-    <method selector='level'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='localName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='localNameForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='namespaceWithName:stringValue:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='stringValue' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='nextNode'>
-      <retval declared_type='NSXMLNode*' type='@'/>
-    </method>
-    <method selector='nextSibling'>
-      <retval declared_type='NSXMLNode*' type='@'/>
-    </method>
-    <method selector='nodesForXPath:error:'>
-      <arg name='xpath' declared_type='NSString*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='objectValue'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='objectsForXQuery:constants:error:'>
-      <arg name='xquery' declared_type='NSString*' type='@' index='0'/>
-      <arg name='constants' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='2'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='objectsForXQuery:error:'>
-      <arg name='xquery' declared_type='NSString*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='parent'>
-      <retval declared_type='NSXMLNode*' type='@'/>
-    </method>
-    <method class_method='true' selector='predefinedNamespaceForPrefix:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSXMLNode*' type='@'/>
-    </method>
-    <method selector='prefix'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='prefixForName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='previousNode'>
-      <retval declared_type='NSXMLNode*' type='@'/>
-    </method>
-    <method selector='previousSibling'>
-      <retval declared_type='NSXMLNode*' type='@'/>
-    </method>
-    <method class_method='true' selector='processingInstructionWithName:stringValue:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='stringValue' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='rootDocument'>
-      <retval declared_type='NSXMLDocument*' type='@'/>
-    </method>
-    <method selector='setName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setObjectValue:'>
-      <arg name='value' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStringValue:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStringValue:resolvingEntities:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='resolve' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setURI:'>
-      <arg name='URI' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stringValue'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='textWithStringValue:'>
-      <arg name='stringValue' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='NSXMLParser'>
-    <method selector='abortParsing'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='columnNumber'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='delegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithContentsOfURL:'>
-      <arg name='url' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='lineNumber'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='parse'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='parserError'>
-      <retval declared_type='NSError*' type='@'/>
-    </method>
-    <method selector='publicID'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShouldProcessNamespaces:'>
-      <arg name='shouldProcessNamespaces' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShouldReportNamespacePrefixes:'>
-      <arg name='shouldReportNamespacePrefixes' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShouldResolveExternalEntities:'>
-      <arg name='shouldResolveExternalEntities' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shouldProcessNamespaces'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='shouldReportNamespacePrefixes'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='shouldResolveExternalEntities'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='systemID'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <informal_protocol name='NSArchiverCallback'>
-    <method type='#8@0:4' type64='#16@0:8' selector='classForArchiver'/>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='replacementObjectForArchiver:'>
-      <arg name='archiver' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSClassDescriptionPrimitives'>
-    <method type='@8@0:4' type64='@16@0:8' selector='attributeKeys'/>
-    <method type='@8@0:4' type64='@16@0:8' selector='classDescription'/>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='inverseForRelationshipKey:'>
-      <arg name='relationshipKey' index='0'/>
-    </method>
-    <method type='@8@0:4' type64='@16@0:8' selector='toManyRelationshipKeys'/>
-    <method type='@8@0:4' type64='@16@0:8' selector='toOneRelationshipKeys'/>
-  </informal_protocol>
-  <informal_protocol name='NSCoderMethods'>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='awakeAfterUsingCoder:'>
-      <arg name='aDecoder' index='0'/>
-    </method>
-    <method type='#8@0:4' type64='#16@0:8' selector='classForCoder'/>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='replacementObjectForCoder:'>
-      <arg name='aCoder' index='0'/>
-    </method>
-    <method class_method='true' type='v12@0:4i8' type64='v24@0:8q16' selector='setVersion:'>
-      <arg name='aVersion' index='0'/>
-    </method>
-    <method class_method='true' type='i8@0:4' type64='q16@0:8' selector='version'/>
-  </informal_protocol>
-  <informal_protocol name='NSComparisonMethods'>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='doesContain:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='isCaseInsensitiveLike:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='isEqualTo:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='isGreaterThan:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='isGreaterThanOrEqualTo:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='isLessThan:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='isLessThanOrEqualTo:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='isLike:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='isNotEqualTo:'>
-      <arg name='object' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSConnectionDelegateMethods'>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='authenticateComponents:withData:'>
-      <arg name='components' index='0'/>
-      <arg name='signature' index='1'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='authenticationDataForComponents:'>
-      <arg name='components' index='0'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='connection:shouldMakeNewConnection:'>
-      <arg name='ancestor' index='0'/>
-      <arg name='conn' index='1'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='createConversationForConnection:'>
-      <arg name='conn' index='0'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='makeNewConnection:sender:'>
-      <arg name='conn' index='0'/>
-      <arg name='ancestor' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSCopyLinkMoveHandler'>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='fileManager:shouldProceedAfterError:'>
-      <arg name='fm' index='0'/>
-      <arg name='errorInfo' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='fileManager:willProcessPath:'>
-      <arg name='fm' index='0'/>
-      <arg name='path' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSDelayedPerforming'>
-    <method class_method='true' type='v12@0:4@8' type64='v24@0:8@16' selector='cancelPreviousPerformRequestsWithTarget:'>
-      <arg name='aTarget' index='0'/>
-    </method>
-    <method class_method='true' type='v20@0:4@8:12@16' type64='v40@0:8@16:24@32' selector='cancelPreviousPerformRequestsWithTarget:selector:object:'>
-      <arg name='aTarget' index='0'/>
-      <arg name='aSelector' index='1'/>
-      <arg name='anArgument' index='2'/>
-    </method>
-    <method type='v24@0:4:8@12d16' type64='v40@0:8:16@24d32' selector='performSelector:withObject:afterDelay:'>
-      <arg name='aSelector' index='0'/>
-      <arg name='anArgument' index='1'/>
-      <arg name='delay' index='2'/>
-    </method>
-    <method type='v28@0:4:8@12d16@24' type64='v48@0:8:16@24d32@40' selector='performSelector:withObject:afterDelay:inModes:'>
-      <arg name='aSelector' index='0'/>
-      <arg name='anArgument' index='1'/>
-      <arg name='delay' index='2'/>
-      <arg name='modes' index='3'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSDeprecatedKeyValueCoding'>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='handleQueryWithUnboundKey:'>
-      <arg name='key' index='0'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='handleTakeValue:forUnboundKey:'>
-      <arg name='value' index='0'/>
-      <arg name='key' index='1'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='storedValueForKey:'>
-      <arg name='key' index='0'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='takeStoredValue:forKey:'>
-      <arg name='value' index='0'/>
-      <arg name='key' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='takeValue:forKey:'>
-      <arg name='value' index='0'/>
-      <arg name='key' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='takeValue:forKeyPath:'>
-      <arg name='value' index='0'/>
-      <arg name='keyPath' index='1'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='takeValuesFromDictionary:'>
-      <arg name='properties' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='unableToSetNilForKey:'>
-      <arg name='key' index='0'/>
-    </method>
-    <method class_method='true' type='B8@0:4' type64='B16@0:8' selector='useStoredAccessor'/>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='valuesForKeys:'>
-      <arg name='keys' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSDeprecatedKeyValueObservingCustomization'>
-    <method class_method='true' type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='setKeys:triggerChangeNotificationsForDependentKey:'>
-      <arg name='keys' index='0'/>
-      <arg name='dependentKey' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSDeprecatedMethods'>
-    <method class_method='true' type='v12@0:4#8' type64='v24@0:8#16' selector='poseAsClass:'>
-      <arg name='aClass' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSDistantObjectRequestMethods'>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='connection:handleRequest:'>
-      <arg name='connection' index='0'/>
-      <arg name='doreq' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSDistributedObjects'>
-    <method type='#8@0:4' type64='#16@0:8' selector='classForPortCoder'/>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='replacementObjectForPortCoder:'>
-      <arg name='coder' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSErrorRecoveryAttempting'>
-    <method type='B16@0:4@8I12' type64='B32@0:8@16Q24' selector='attemptRecoveryFromError:optionIndex:'>
-      <arg name='error' index='0'/>
-      <arg name='recoveryOptionIndex' index='1'/>
-    </method>
-    <method type='v28@0:4@8I12@16:20^v24' type64='v56@0:8@16Q24@32:40^v48' selector='attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:'>
-      <arg name='error' index='0'/>
-      <arg name='recoveryOptionIndex' index='1'/>
-      <arg name='delegate' index='2'/>
-      <arg name='didRecoverSelector' index='3'/>
-      <arg name='contextInfo' index='4'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSFileManagerFileOperationAdditions'>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='fileManager:shouldCopyItemAtPath:toPath:'>
-      <arg name='fileManager' index='0'/>
-      <arg name='srcPath' index='1'/>
-      <arg name='dstPath' index='2'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='fileManager:shouldLinkItemAtPath:toPath:'>
-      <arg name='fileManager' index='0'/>
-      <arg name='srcPath' index='1'/>
-      <arg name='dstPath' index='2'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='fileManager:shouldMoveItemAtPath:toPath:'>
-      <arg name='fileManager' index='0'/>
-      <arg name='srcPath' index='1'/>
-      <arg name='dstPath' index='2'/>
-    </method>
-    <method type='B24@0:4@8@12@16@20' type64='B48@0:8@16@24@32@40' selector='fileManager:shouldProceedAfterError:copyingItemAtPath:toPath:'>
-      <arg name='fileManager' index='0'/>
-      <arg name='error' index='1'/>
-      <arg name='srcPath' index='2'/>
-      <arg name='dstPath' index='3'/>
-    </method>
-    <method type='B24@0:4@8@12@16@20' type64='B48@0:8@16@24@32@40' selector='fileManager:shouldProceedAfterError:linkingItemAtPath:toPath:'>
-      <arg name='fileManager' index='0'/>
-      <arg name='error' index='1'/>
-      <arg name='srcPath' index='2'/>
-      <arg name='dstPath' index='3'/>
-    </method>
-    <method type='B24@0:4@8@12@16@20' type64='B48@0:8@16@24@32@40' selector='fileManager:shouldProceedAfterError:movingItemAtPath:toPath:'>
-      <arg name='fileManager' index='0'/>
-      <arg name='error' index='1'/>
-      <arg name='srcPath' index='2'/>
-      <arg name='dstPath' index='3'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='fileManager:shouldProceedAfterError:removingItemAtPath:'>
-      <arg name='fileManager' index='0'/>
-      <arg name='error' index='1'/>
-      <arg name='path' index='2'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='fileManager:shouldRemoveItemAtPath:'>
-      <arg name='fileManager' index='0'/>
-      <arg name='path' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSKeyValueCoding'>
-    <method class_method='true' type='B8@0:4' type64='B16@0:8' selector='accessInstanceVariablesDirectly'/>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='dictionaryWithValuesForKeys:'>
-      <arg name='keys' index='0'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='mutableArrayValueForKey:'>
-      <arg name='key' index='0'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='mutableArrayValueForKeyPath:'>
-      <arg name='keyPath' index='0'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='mutableSetValueForKey:'>
-      <arg name='key' index='0'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='mutableSetValueForKeyPath:'>
-      <arg name='keyPath' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='setNilValueForKey:'>
-      <arg name='key' index='0'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='setValue:forKey:'>
-      <arg name='value' index='0'/>
-      <arg name='key' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='setValue:forKeyPath:'>
-      <arg name='value' index='0'/>
-      <arg name='keyPath' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='setValue:forUndefinedKey:'>
-      <arg name='value' index='0'/>
-      <arg name='key' index='1'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='setValuesForKeysWithDictionary:'>
-      <arg name='keyedValues' index='0'/>
-    </method>
-    <method type='B20@0:4^@8@12^@16' type64='B40@0:8^@16@24^@32' selector='validateValue:forKey:error:'>
-      <arg name='ioValue' index='0'/>
-      <arg name='inKey' index='1'/>
-      <arg name='outError' index='2'/>
-    </method>
-    <method type='B20@0:4^@8@12^@16' type64='B40@0:8^@16@24^@32' selector='validateValue:forKeyPath:error:'>
-      <arg name='ioValue' index='0'/>
-      <arg name='inKeyPath' index='1'/>
-      <arg name='outError' index='2'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='valueForKey:'>
-      <arg name='key' index='0'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='valueForKeyPath:'>
-      <arg name='keyPath' index='0'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='valueForUndefinedKey:'>
-      <arg name='key' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSKeyValueObserverNotification'>
-    <method type='v20@0:4I8@12@16' type64='v40@0:8Q16@24@32' selector='didChange:valuesAtIndexes:forKey:'>
-      <arg name='changeKind' index='0'/>
-      <arg name='indexes' index='1'/>
-      <arg name='key' index='2'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='didChangeValueForKey:'>
-      <arg name='key' index='0'/>
-    </method>
-    <method type='v20@0:4@8I12@16' type64='v40@0:8@16Q24@32' selector='didChangeValueForKey:withSetMutation:usingObjects:'>
-      <arg name='key' index='0'/>
-      <arg name='mutationKind' index='1'/>
-      <arg name='objects' index='2'/>
-    </method>
-    <method type='v20@0:4I8@12@16' type64='v40@0:8Q16@24@32' selector='willChange:valuesAtIndexes:forKey:'>
-      <arg name='changeKind' index='0'/>
-      <arg name='indexes' index='1'/>
-      <arg name='key' index='2'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='willChangeValueForKey:'>
-      <arg name='key' index='0'/>
-    </method>
-    <method type='v20@0:4@8I12@16' type64='v40@0:8@16Q24@32' selector='willChangeValueForKey:withSetMutation:usingObjects:'>
-      <arg name='key' index='0'/>
-      <arg name='mutationKind' index='1'/>
-      <arg name='objects' index='2'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSKeyValueObserverRegistration'>
-    <method type='v24@0:4@8@12I16^v20' type64='v48@0:8@16@24Q32^v40' selector='addObserver:forKeyPath:options:context:'>
-      <arg name='observer' index='0'/>
-      <arg name='keyPath' index='1'/>
-      <arg name='options' index='2'/>
-      <arg name='context' index='3'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='removeObserver:forKeyPath:'>
-      <arg name='observer' index='0'/>
-      <arg name='keyPath' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSKeyValueObserving'>
-    <method type='v24@0:4@8@12@16^v20' type64='v48@0:8@16@24@32^v40' selector='observeValueForKeyPath:ofObject:change:context:'>
-      <arg name='keyPath' index='0'/>
-      <arg name='object' index='1'/>
-      <arg name='change' index='2'/>
-      <arg name='context' index='3'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSKeyValueObservingCustomization'>
-    <method class_method='true' type='B12@0:4@8' type64='B24@0:8@16' selector='automaticallyNotifiesObserversForKey:'>
-      <arg name='key' index='0'/>
-    </method>
-    <method class_method='true' type='@12@0:4@8' type64='@24@0:8@16' selector='keyPathsForValuesAffectingValueForKey:'>
-      <arg name='key' index='0'/>
-    </method>
-    <method type='^v8@0:4' type64='^v16@0:8' selector='observationInfo'/>
-    <method type='v12@0:4^v8' type64='v24@0:8^v16' selector='setObservationInfo:'>
-      <arg name='observationInfo' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSKeyedArchiverDelegate'>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='archiver:didEncodeObject:'>
-      <arg name='archiver' index='0'/>
-      <arg name='object' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='archiver:willEncodeObject:'>
-      <arg name='archiver' index='0'/>
-      <arg name='object' index='1'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='archiver:willReplaceObject:withObject:'>
-      <arg name='archiver' index='0'/>
-      <arg name='object' index='1'/>
-      <arg name='newObject' index='2'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='archiverDidFinish:'>
-      <arg name='archiver' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='archiverWillFinish:'>
-      <arg name='archiver' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSKeyedArchiverObjectSubstitution'>
-    <method class_method='true' type='@8@0:4' type64='@16@0:8' selector='classFallbacksForKeyedArchiver'/>
-    <method type='#8@0:4' type64='#16@0:8' selector='classForKeyedArchiver'/>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='replacementObjectForKeyedArchiver:'>
-      <arg name='archiver' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSKeyedUnarchiverDelegate'>
-    <method type='#20@0:4@8@12@16' type64='#40@0:8@16@24@32' selector='unarchiver:cannotDecodeObjectOfClassName:originalClasses:'>
-      <arg name='unarchiver' index='0'/>
-      <arg name='name' index='1'/>
-      <arg name='classNames' index='2'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='unarchiver:didDecodeObject:'>
-      <arg name='unarchiver' index='0'/>
-      <arg name='object' index='1'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='unarchiver:willReplaceObject:withObject:'>
-      <arg name='unarchiver' index='0'/>
-      <arg name='object' index='1'/>
-      <arg name='newObject' index='2'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='unarchiverDidFinish:'>
-      <arg name='unarchiver' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='unarchiverWillFinish:'>
-      <arg name='unarchiver' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSKeyedUnarchiverObjectSubstitution'>
-    <method class_method='true' type='#8@0:4' type64='#16@0:8' selector='classForKeyedUnarchiver'/>
-  </informal_protocol>
-  <informal_protocol name='NSMachPortDelegateMethods'>
-    <method type='v12@0:4^v8' type64='v24@0:8^v16' selector='handleMachMessage:'>
-      <arg name='msg' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSMetadataQueryDelegate'>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='metadataQuery:replacementObjectForResultObject:'>
-      <arg name='query' index='0'/>
-      <arg name='result' index='1'/>
-    </method>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='metadataQuery:replacementValueForAttribute:value:'>
-      <arg name='query' index='0'/>
-      <arg name='attrName' index='1'/>
-      <arg name='attrValue' index='2'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSNetServiceBrowserDelegateMethods'>
-    <method type='v20@0:4@8@12B16' type64='v36@0:8@16@24B32' selector='netServiceBrowser:didFindDomain:moreComing:'>
-      <arg name='aNetServiceBrowser' index='0'/>
-      <arg name='domainString' index='1'/>
-      <arg name='moreComing' index='2'/>
-    </method>
-    <method type='v20@0:4@8@12B16' type64='v36@0:8@16@24B32' selector='netServiceBrowser:didFindService:moreComing:'>
-      <arg name='aNetServiceBrowser' index='0'/>
-      <arg name='aNetService' index='1'/>
-      <arg name='moreComing' index='2'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='netServiceBrowser:didNotSearch:'>
-      <arg name='aNetServiceBrowser' index='0'/>
-      <arg name='errorDict' index='1'/>
-    </method>
-    <method type='v20@0:4@8@12B16' type64='v36@0:8@16@24B32' selector='netServiceBrowser:didRemoveDomain:moreComing:'>
-      <arg name='aNetServiceBrowser' index='0'/>
-      <arg name='domainString' index='1'/>
-      <arg name='moreComing' index='2'/>
-    </method>
-    <method type='v20@0:4@8@12B16' type64='v36@0:8@16@24B32' selector='netServiceBrowser:didRemoveService:moreComing:'>
-      <arg name='aNetServiceBrowser' index='0'/>
-      <arg name='aNetService' index='1'/>
-      <arg name='moreComing' index='2'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='netServiceBrowserDidStopSearch:'>
-      <arg name='aNetServiceBrowser' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='netServiceBrowserWillSearch:'>
-      <arg name='aNetServiceBrowser' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSNetServiceDelegateMethods'>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='netService:didNotPublish:'>
-      <arg name='sender' index='0'/>
-      <arg name='errorDict' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='netService:didNotResolve:'>
-      <arg name='sender' index='0'/>
-      <arg name='errorDict' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='netService:didUpdateTXTRecordData:'>
-      <arg name='sender' index='0'/>
-      <arg name='data' index='1'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='netServiceDidPublish:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='netServiceDidResolveAddress:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='netServiceDidStop:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='netServiceWillPublish:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='netServiceWillResolve:'>
-      <arg name='sender' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSPortDelegateMethods'>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='handlePortMessage:'>
-      <arg name='message' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSScriptClassDescription'>
-    <method type='L8@0:4' type64='I16@0:8' selector='classCode'/>
-    <method type='@8@0:4' type64='@16@0:8' selector='className'/>
-  </informal_protocol>
-  <informal_protocol name='NSScriptKeyValueCoding'>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='coerceValue:forKey:'>
-      <arg name='value' index='0'/>
-      <arg name='key' index='1'/>
-    </method>
-    <method type='v20@0:4@8I12@16' type64='v40@0:8@16Q24@32' selector='insertValue:atIndex:inPropertyWithKey:'>
-      <arg name='value' index='0'/>
-      <arg name='index' index='1'/>
-      <arg name='key' index='2'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='insertValue:inPropertyWithKey:'>
-      <arg name='value' index='0'/>
-      <arg name='key' index='1'/>
-    </method>
-    <method type='v16@0:4I8@12' type64='v32@0:8Q16@24' selector='removeValueAtIndex:fromPropertyWithKey:'>
-      <arg name='index' index='0'/>
-      <arg name='key' index='1'/>
-    </method>
-    <method type='v20@0:4I8@12@16' type64='v40@0:8Q16@24@32' selector='replaceValueAtIndex:inPropertyWithKey:withValue:'>
-      <arg name='index' index='0'/>
-      <arg name='key' index='1'/>
-      <arg name='value' index='2'/>
-    </method>
-    <method type='@16@0:4I8@12' type64='@32@0:8Q16@24' selector='valueAtIndex:inPropertyWithKey:'>
-      <arg name='index' index='0'/>
-      <arg name='key' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='valueWithName:inPropertyWithKey:'>
-      <arg name='name' index='0'/>
-      <arg name='key' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='valueWithUniqueID:inPropertyWithKey:'>
-      <arg name='uniqueID' index='0'/>
-      <arg name='key' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSScriptObjectSpecifiers'>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='indicesOfObjectsByEvaluatingObjectSpecifier:'>
-      <arg name='specifier' index='0'/>
-    </method>
-    <method type='@8@0:4' type64='@16@0:8' selector='objectSpecifier'/>
-  </informal_protocol>
-  <informal_protocol name='NSScripting'>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='copyScriptingValue:forKey:withProperties:'>
-      <arg name='value' index='0'/>
-      <arg name='key' index='1'/>
-      <arg name='properties' index='2'/>
-    </method>
-    <method type='@24@0:4#8@12@16@20' type64='@48@0:8#16@24@32@40' selector='newScriptingObjectOfClass:forValueForKey:withContentsValue:properties:'>
-      <arg name='objectClass' index='0'/>
-      <arg name='key' index='1'/>
-      <arg name='contentsValue' index='2'/>
-      <arg name='properties' index='3'/>
-    </method>
-    <method type='@8@0:4' type64='@16@0:8' selector='scriptingProperties'/>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='scriptingValueForSpecifier:'>
-      <arg name='objectSpecifier' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='setScriptingProperties:'>
-      <arg name='properties' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSScriptingComparisonMethods'>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='scriptingBeginsWith:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='scriptingContains:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='scriptingEndsWith:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='scriptingIsEqualTo:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='scriptingIsGreaterThan:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='scriptingIsGreaterThanOrEqualTo:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='scriptingIsLessThan:'>
-      <arg name='object' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='scriptingIsLessThanOrEqualTo:'>
-      <arg name='object' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSSpellServerDelegate'>
-    <method type='{_NSRange=II}24@0:4@8@12@16^@20' type64='{_NSRange=QQ}48@0:8@16@24@32^@40' selector='spellServer:checkGrammarInString:language:details:'>
-      <arg name='sender' index='0'/>
-      <arg name='stringToCheck' index='1'/>
-      <arg name='language' index='2'/>
-      <arg name='details' index='3'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='spellServer:didForgetWord:inLanguage:'>
-      <arg name='sender' index='0'/>
-      <arg name='word' index='1'/>
-      <arg name='language' index='2'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='spellServer:didLearnWord:inLanguage:'>
-      <arg name='sender' index='0'/>
-      <arg name='word' index='1'/>
-      <arg name='language' index='2'/>
-    </method>
-    <method type='{_NSRange=II}28@0:4@8@12@16^i20B24' type64='{_NSRange=QQ}52@0:8@16@24@32^q40B48' selector='spellServer:findMisspelledWordInString:language:wordCount:countOnly:'>
-      <arg name='sender' index='0'/>
-      <arg name='stringToCheck' index='1'/>
-      <arg name='language' index='2'/>
-      <arg name='wordCount' index='3'/>
-      <arg name='countOnly' index='4'/>
-    </method>
-    <method type='@28@0:4@8{_NSRange=II}12@20@24' type64='@56@0:8@16{_NSRange=QQ}24@40@48' selector='spellServer:suggestCompletionsForPartialWordRange:inString:language:'>
-      <arg name='sender' index='0'/>
-      <arg name='range' index='1'/>
-      <arg name='string' index='2'/>
-      <arg name='language' index='3'/>
-    </method>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='spellServer:suggestGuessesForWord:inLanguage:'>
-      <arg name='sender' index='0'/>
-      <arg name='word' index='1'/>
-      <arg name='language' index='2'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSStreamDelegateEventExtensions'>
-    <method type='v16@0:4@8I12' type64='v32@0:8@16Q24' selector='stream:handleEvent:'>
-      <arg name='aStream' index='0'/>
-      <arg name='eventCode' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSThreadPerformAdditions'>
-    <method type='v24@0:4:8@12@16B20' type64='v44@0:8:16@24@32B40' selector='performSelector:onThread:withObject:waitUntilDone:'>
-      <arg name='aSelector' index='0'/>
-      <arg name='thr' index='1'/>
-      <arg name='arg' index='2'/>
-      <arg name='wait' index='3'/>
-    </method>
-    <method type='v28@0:4:8@12@16B20@24' type64='v52@0:8:16@24@32B40@44' selector='performSelector:onThread:withObject:waitUntilDone:modes:'>
-      <arg name='aSelector' index='0'/>
-      <arg name='thr' index='1'/>
-      <arg name='arg' index='2'/>
-      <arg name='wait' index='3'/>
-      <arg name='array' index='4'/>
-    </method>
-    <method type='v16@0:4:8@12' type64='v32@0:8:16@24' selector='performSelectorInBackground:withObject:'>
-      <arg name='aSelector' index='0'/>
-      <arg name='arg' index='1'/>
-    </method>
-    <method type='v20@0:4:8@12B16' type64='v36@0:8:16@24B32' selector='performSelectorOnMainThread:withObject:waitUntilDone:'>
-      <arg name='aSelector' index='0'/>
-      <arg name='arg' index='1'/>
-      <arg name='wait' index='2'/>
-    </method>
-    <method type='v24@0:4:8@12B16@20' type64='v44@0:8:16@24B32@36' selector='performSelectorOnMainThread:withObject:waitUntilDone:modes:'>
-      <arg name='aSelector' index='0'/>
-      <arg name='arg' index='1'/>
-      <arg name='wait' index='2'/>
-      <arg name='array' index='3'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSURLClient'>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='URL:resourceDataDidBecomeAvailable:'>
-      <arg name='sender' index='0'/>
-      <arg name='newBytes' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='URL:resourceDidFailLoadingWithReason:'>
-      <arg name='sender' index='0'/>
-      <arg name='reason' index='1'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='URLResourceDidCancelLoading:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='URLResourceDidFinishLoading:'>
-      <arg name='sender' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSURLConnectionDelegate'>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='connection:didCancelAuthenticationChallenge:'>
-      <arg name='connection' index='0'/>
-      <arg name='challenge' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='connection:didFailWithError:'>
-      <arg name='connection' index='0'/>
-      <arg name='error' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='connection:didReceiveAuthenticationChallenge:'>
-      <arg name='connection' index='0'/>
-      <arg name='challenge' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='connection:didReceiveData:'>
-      <arg name='connection' index='0'/>
-      <arg name='data' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='connection:didReceiveResponse:'>
-      <arg name='connection' index='0'/>
-      <arg name='response' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='connection:willCacheResponse:'>
-      <arg name='connection' index='0'/>
-      <arg name='cachedResponse' index='1'/>
-    </method>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='connection:willSendRequest:redirectResponse:'>
-      <arg name='connection' index='0'/>
-      <arg name='request' index='1'/>
-      <arg name='response' index='2'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='connectionDidFinishLoading:'>
-      <arg name='connection' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSURLDownloadDelegate'>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='download:decideDestinationWithSuggestedFilename:'>
-      <arg name='download' index='0'/>
-      <arg name='filename' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='download:didCancelAuthenticationChallenge:'>
-      <arg name='download' index='0'/>
-      <arg name='challenge' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='download:didCreateDestination:'>
-      <arg name='download' index='0'/>
-      <arg name='path' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='download:didFailWithError:'>
-      <arg name='download' index='0'/>
-      <arg name='error' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='download:didReceiveAuthenticationChallenge:'>
-      <arg name='download' index='0'/>
-      <arg name='challenge' index='1'/>
-    </method>
-    <method type='v16@0:4@8I12' type64='v32@0:8@16Q24' selector='download:didReceiveDataOfLength:'>
-      <arg name='download' index='0'/>
-      <arg name='length' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='download:didReceiveResponse:'>
-      <arg name='download' index='0'/>
-      <arg name='response' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='download:shouldDecodeSourceDataOfMIMEType:'>
-      <arg name='download' index='0'/>
-      <arg name='encodingType' index='1'/>
-    </method>
-    <method type='v24@0:4@8@12q16' type64='v40@0:8@16@24q32' selector='download:willResumeWithResponse:fromByte:'>
-      <arg name='download' index='0'/>
-      <arg name='response' index='1'/>
-      <arg name='startingByte' index='2'/>
-    </method>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='download:willSendRequest:redirectResponse:'>
-      <arg name='download' index='0'/>
-      <arg name='request' index='1'/>
-      <arg name='redirectResponse' index='2'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='downloadDidBegin:'>
-      <arg name='download' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='downloadDidFinish:'>
-      <arg name='download' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='NSXMLParserDelegateEventAdditions'>
-    <method type='v24@0:4@8@12@16@20' type64='v48@0:8@16@24@32@40' selector='parser:didEndElement:namespaceURI:qualifiedName:'>
-      <arg name='parser' index='0'/>
-      <arg name='elementName' index='1'/>
-      <arg name='namespaceURI' index='2'/>
-      <arg name='qName' index='3'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='parser:didEndMappingPrefix:'>
-      <arg name='parser' index='0'/>
-      <arg name='prefix' index='1'/>
-    </method>
-    <method type='v28@0:4@8@12@16@20@24' type64='v56@0:8@16@24@32@40@48' selector='parser:didStartElement:namespaceURI:qualifiedName:attributes:'>
-      <arg name='parser' index='0'/>
-      <arg name='elementName' index='1'/>
-      <arg name='namespaceURI' index='2'/>
-      <arg name='qName' index='3'/>
-      <arg name='attributeDict' index='4'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='parser:didStartMappingPrefix:toURI:'>
-      <arg name='parser' index='0'/>
-      <arg name='prefix' index='1'/>
-      <arg name='namespaceURI' index='2'/>
-    </method>
-    <method type='v28@0:4@8@12@16@20@24' type64='v56@0:8@16@24@32@40@48' selector='parser:foundAttributeDeclarationWithName:forElement:type:defaultValue:'>
-      <arg name='parser' index='0'/>
-      <arg name='attributeName' index='1'/>
-      <arg name='elementName' index='2'/>
-      <arg name='type' index='3'/>
-      <arg name='defaultValue' index='4'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='parser:foundCDATA:'>
-      <arg name='parser' index='0'/>
-      <arg name='CDATABlock' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='parser:foundCharacters:'>
-      <arg name='parser' index='0'/>
-      <arg name='string' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='parser:foundComment:'>
-      <arg name='parser' index='0'/>
-      <arg name='comment' index='1'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='parser:foundElementDeclarationWithName:model:'>
-      <arg name='parser' index='0'/>
-      <arg name='elementName' index='1'/>
-      <arg name='model' index='2'/>
-    </method>
-    <method type='v24@0:4@8@12@16@20' type64='v48@0:8@16@24@32@40' selector='parser:foundExternalEntityDeclarationWithName:publicID:systemID:'>
-      <arg name='parser' index='0'/>
-      <arg name='name' index='1'/>
-      <arg name='publicID' index='2'/>
-      <arg name='systemID' index='3'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='parser:foundIgnorableWhitespace:'>
-      <arg name='parser' index='0'/>
-      <arg name='whitespaceString' index='1'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='parser:foundInternalEntityDeclarationWithName:value:'>
-      <arg name='parser' index='0'/>
-      <arg name='name' index='1'/>
-      <arg name='value' index='2'/>
-    </method>
-    <method type='v24@0:4@8@12@16@20' type64='v48@0:8@16@24@32@40' selector='parser:foundNotationDeclarationWithName:publicID:systemID:'>
-      <arg name='parser' index='0'/>
-      <arg name='name' index='1'/>
-      <arg name='publicID' index='2'/>
-      <arg name='systemID' index='3'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='parser:foundProcessingInstructionWithTarget:data:'>
-      <arg name='parser' index='0'/>
-      <arg name='target' index='1'/>
-      <arg name='data' index='2'/>
-    </method>
-    <method type='v28@0:4@8@12@16@20@24' type64='v56@0:8@16@24@32@40@48' selector='parser:foundUnparsedEntityDeclarationWithName:publicID:systemID:notationName:'>
-      <arg name='parser' index='0'/>
-      <arg name='name' index='1'/>
-      <arg name='publicID' index='2'/>
-      <arg name='systemID' index='3'/>
-      <arg name='notationName' index='4'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='parser:parseErrorOccurred:'>
-      <arg name='parser' index='0'/>
-      <arg name='parseError' index='1'/>
-    </method>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='parser:resolveExternalEntityName:systemID:'>
-      <arg name='parser' index='0'/>
-      <arg name='name' index='1'/>
-      <arg name='systemID' index='2'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='parser:validationErrorOccurred:'>
-      <arg name='parser' index='0'/>
-      <arg name='validationError' index='1'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='parserDidEndDocument:'>
-      <arg name='parser' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='parserDidStartDocument:'>
-      <arg name='parser' index='0'/>
-    </method>
-  </informal_protocol>
-</signatures>
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java
index bb5d3aa960..d5f00a9003 100644
--- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java
+++ b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java
@@ -25,29 +25,13 @@ public class MacGenerator {
 
 	PrintStream out;
 	
-public MacGenerator(String[] xmlPaths) {
-	this.xmls = xmlPaths;
-	if (xmls == null || xmls.length == 0) {
-		ArrayList array = new ArrayList();
-		list(new File("/System/Library/Frameworks"), array);
-		list(new File("/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks"), array);
-		Collections.sort(array);
-		xmls = (String[])array.toArray(new String[array.size()]);
-	}
-	documents = new Document[xmls.length];
-	for (int i = 0; i < xmls.length; i++) {
-		String xmlPath = xmls[i];
-		Document document = documents[i] = getDocument(xmlPath);
-		if (document == null) continue;
-		String extrasPath = getFileName(xmlPath) + ".extras";
-		File file = new File(getExtraAttributesDir());
-		if (file.exists()) extrasPath = new File(file, extrasPath).getAbsolutePath();
-		merge(document, getDocument(extrasPath));
-	}
+public MacGenerator() {
 }
 
 static void list(File path, ArrayList list) {
+	if (path == null) return;
 	File[] frameworks = path.listFiles();
+	if (frameworks == null) return;
 	for (int i = 0; i < frameworks.length; i++) {
 		File file = frameworks[i];
 		String name = file.getName();
@@ -120,7 +104,13 @@ public void generateAll() {
 	generateExtraAttributes();
 	generateMainClass();
 	generateClasses();
-	generateMetadata();
+	generateCSource();
+}
+
+void generateCSource() {
+	JNIGeneratorApp app = new JNIGeneratorApp();
+	app.setMainClassName(mainClassName, outputDir + "/library");
+	app.generate();
 }
 
 String fixDelimiter(String str) {
@@ -492,6 +482,7 @@ void generateClasses() {
 }
 
 void generateExtraAttributes() {
+	Document[] documents = getDocuments();
 	for (int x = 0; x < xmls.length; x++) {
 		Document document = documents[x];
 		if (document == null || !getGen(document.getDocumentElement())) continue;
@@ -552,6 +543,7 @@ void generateMainClass() {
 	outln();
 	out("/** Functions */");
 	outln();
+	outln();
 	generateFunctions();
 	outln();
 	out("/** Sends */");
@@ -571,58 +563,39 @@ void generateMainClass() {
 	}
 }
 
-void generateMetadata() {
-	if (!new File(getMetaDataDir()).exists()) {
-		System.out.println("Warning: Meta data output dir does not exist");
-		return;
-	}
-	
-	ByteArrayOutputStream out = new ByteArrayOutputStream();
-	this.out = new PrintStream(out);
-
-	String fileName = getMetaDataDir() + mainClassName + ".properties";
-	FileInputStream is = null;
-	try {
-		InputStreamReader input = new InputStreamReader(new BufferedInputStream(is = new FileInputStream(fileName)));
-		StringBuffer str = new StringBuffer();
-		char[] buffer = new char[4096];
-		int read;
-		while ((read = input.read(buffer)) != -1) {
-			str.append(buffer, 0, read);
+public Document[] getDocuments() {
+	if (documents == null) {
+		String[] xmls = getXmls();
+		documents = new Document[xmls.length];
+		for (int i = 0; i < xmls.length; i++) {
+			String xmlPath = xmls[i];
+			Document document = documents[i] = getDocument(xmlPath);
+			if (document == null) continue;
+			if (mainClassName != null && outputDir != null) {
+				String packageName = getPackageName(mainClassName);
+				String extrasPath = outputDir + packageName.replace('.', '/') + "/" + getFileName(xmlPath) + ".extras";
+				merge(document, getDocument(extrasPath));
+			}
 		}
-		out(str.toString());
-	} catch (IOException e) {
-	} finally {
-		try {
-			if (is != null) is.close();
-		} catch (IOException e) {}
 	}
-	
-	generateConstantsMetaData();
-	generateSendsMetaData();
-	generateStructsMetaData();
-	
-	try {
-		out.flush();
-		
-		if (out.size() > 0) output(out.toByteArray(), fileName);
-	} catch (Exception e) {
-		System.out.println("Problem");
-		e.printStackTrace(System.out);
-	}
-}
-
-public Document[] getDocuments() {
 	return documents;
 }
 
 public String[] getXmls() {
+	if (xmls == null || xmls.length == 0) {
+		ArrayList array = new ArrayList();
+		list(new File("/System/Library/Frameworks"), array);
+		list(new File("/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks"), array);
+		Collections.sort(array);
+		xmls = (String[])array.toArray(new String[array.size()]);
+	}
 	return xmls;
 }
 
 void saveExtraAttributes(String xmlPath, Document document) {
 	try {
-		String fileName = getExtraAttributesDir() + getFileName(xmlPath) + ".extras";
+		String packageName = getPackageName(mainClassName);
+		String fileName = outputDir + packageName.replace('.', '/') + "/" + getFileName(xmlPath) + ".extras";
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		DOMWriter writer = new DOMWriter(new PrintStream(out), false);
 		String[] names = getIDAttributeNames();
@@ -640,9 +613,18 @@ void saveExtraAttributes(String xmlPath, Document document) {
 }
 
 public void setOutputDir(String dir) {
+	if (dir != null) {
+		if (!dir.endsWith("\\") && !dir.endsWith("/") ) {
+			dir += "/";
+		}
+	}
 	this.outputDir = dir;
 }
 
+public void setXmls(String[] xmls) {
+	this.xmls = xmls;
+}
+
 public void setMainClass(String mainClassName) {
 	this.mainClassName = mainClassName;
 }
@@ -768,6 +750,8 @@ void generateConstants() {
 				if (getGen(node)) {
 					NamedNodeMap attributes = node.getAttributes();
 					String constName = attributes.getNamedItem("name").getNodeValue();
+					out("/** @method flags=const */");
+					outln();
 					out("public static final native ");
 					String type = getType(node), type64 = getType64(node);
 					out(type);
@@ -794,25 +778,6 @@ void generateConstants() {
 	}
 }
 
-void generateConstantsMetaData() {
-	for (int x = 0; x < xmls.length; x++) {
-		Document document = documents[x];
-		if (document == null) continue;
-		NodeList list = document.getDocumentElement().getChildNodes();
-		for (int i = 0; i < list.getLength(); i++) {
-			Node node = list.item(i);
-			if ("constant".equals(node.getNodeName()) && getGen(node)) {
-				NamedNodeMap attributes = node.getAttributes();
-				out(getClassName(mainClassName));
-				out("_");
-				out(attributes.getNamedItem("name").getNodeValue());
-				out("=flags=const");
-				outln();
-			}
-		}
-	}
-}
-
 void generateEnums() {
 	for (int x = 0; x < xmls.length; x++) {
 		Document document = documents[x];
@@ -889,10 +854,6 @@ boolean isBoolean(Node node) {
 	return code.equals("B");
 }
 
-String getExtraAttributesDir() {
-	return "./Mac Generation/org/eclipse/swt/tools/internal/";
-}
-
 void buildLookup(Node node, HashMap table) {
 	NodeList list = node.getChildNodes();
 	for (int i = 0; i < list.getLength(); i++) {
@@ -981,73 +942,6 @@ void generateSelectorsConst() {
 	}
 }
 
-void generateStructsMetaData() {
-	TreeSet set = new TreeSet();
-	for (int x = 0; x < xmls.length; x++) {
-		Document document = documents[x];
-		if (document == null) continue;
-		NodeList list = document.getDocumentElement().getChildNodes();
-		for (int i = 0; i < list.getLength(); i++) {
-			Node node = list.item(i);
-			if ("struct".equals(node.getNodeName()) && getGen(node)) {
-				set.add(getIDAttribute(node).getNodeValue());
-			}
-		}
-	}
-	String className = getClassName(mainClassName);
-	String packageName = getPackageName(mainClassName).replace('.', '_');
-	for (Iterator iterator = set.iterator(); iterator.hasNext();) {
-		String struct = (String) iterator.next();
-		{
-			StringBuffer buffer = new StringBuffer();
-			buffer.append(className);
-			buffer.append("_memmove__IL");
-			buffer.append(packageName);
-			buffer.append("_");
-			buffer.append(struct);
-			buffer.append("_2I");
-			String key = buffer.toString();
-			out(key);
-			out("=");
-			outln();
-			out(key);
-			out("_0=cast=(void *)");
-			outln();
-			out(key);
-			out("_1=cast=(void *)");
-			outln();
-			out(key);
-			out("=");
-			outln();
-			outln();
-		}
-		
-		{
-			StringBuffer buffer = new StringBuffer();
-			buffer.append(className);
-			buffer.append("_memmove__L");
-			buffer.append(packageName);
-			buffer.append("_");
-			buffer.append(struct);
-			buffer.append("_2II");
-			String key = buffer.toString();
-			out(key);
-			out("=");
-			outln();
-			out(key);
-			out("_0=cast=(void *)");
-			outln();
-			out(key);
-			out("_1=cast=(void *)");
-			outln();
-			out(key);
-			out("=");
-			outln();
-			outln();
-		}
-	}
-}
-
 void generateStructNatives() {
 	TreeSet set = new TreeSet();
 	for (int x = 0; x < xmls.length; x++) {
@@ -1073,13 +967,32 @@ void generateStructNatives() {
 	outln();
 	out("/** Memmove natives */");
 	outln();
+	outln();
 	for (Iterator iterator = set.iterator(); iterator.hasNext();) {
 		String struct = (String) iterator.next();
+		out("/**");
+		outln();
+		out(" * @param dest cast=(void *),flags=no_in critical");
+		outln();
+		out(" * @param src cast=(void *),flags=critical");
+//		out(" * @param src cast=(void *),flags=no_out critical");
+		outln();
+		out(" */");
+		outln();
 		out("public static final native void memmove(");
 		out("int /*long*/ dest, ");
 		out(struct);
 		out(" src, int /*long*/ size);");
 		outln();
+		out("/**");
+		outln();
+		out(" * @param dest cast=(void *),flags=no_in critical");
+		outln();
+		out(" * @param src cast=(void *),flags=critical");
+//		out(" * @param src cast=(void *),flags=no_out critical");
+		outln();
+		out(" */");
+		outln();
 		out("public static final native void memmove(");
 		out(struct);
 		out(" dest, int /*long*/ src, int /*long*/ size);");
@@ -1187,125 +1100,54 @@ void generateSends() {
 			set64.remove(tagCode);
 		}
 	}
-	TreeSet all = new TreeSet();
+	TreeMap all = new TreeMap();
 	for (Iterator iterator = tagsSet.keySet().iterator(); iterator.hasNext();) {
 		String key = (String) iterator.next();
 		Node method = (Node)tagsSet.get(key);
-		all.add(buildSend(method, true, false));
+		all.put(buildSend(method, true, false), method);
 	}
 	for (Iterator iterator = set.keySet().iterator(); iterator.hasNext();) {
 		String key = (String) iterator.next();
-		all.add(key);
+		all.put(key, set.get(key));
 	}
 	for (Iterator iterator = set64.keySet().iterator(); iterator.hasNext();) {
 		String key = (String) iterator.next();
-		all.add(key);
-	}
-	for (Iterator iterator = all.iterator(); iterator.hasNext();) {
-		out(iterator.next().toString());
-		outln();
+		all.put(key, set64.get(key));
 	}
-}
-
-void generateSendsMetaData() {
-	String className = getClassName(mainClassName);
-	String packageName = getPackageName(mainClassName).replace('.', '_');
-	HashMap set = new HashMap();
-	for (int x = 0; x < xmls.length; x++) {
-		Document document = documents[x];
-		if (document == null) continue;
-		NodeList list = document.getDocumentElement().getChildNodes();
-		for (int i = 0; i < list.getLength(); i++) {
-			Node node = list.item(i);
-			if ("class".equals(node.getNodeName()) && getGen(node)) {
-				NodeList methods = node.getChildNodes();
-				for (int j = 0; j < methods.getLength(); j++) {
-					Node method = methods.item(j);
-					if ("method".equals(method.getNodeName())) {
-						Node returnNode = getReturnNode(method.getChildNodes());
-						StringBuffer buffer = new StringBuffer();
-						buffer.append(className);
-						if (returnNode != null && isStruct(returnNode)) {
-							buffer.append("_objc_1msgSend_1stret__");
-							buffer.append("L");
-							buffer.append(packageName);
-							buffer.append(".");
-							buffer.append(getJavaType(returnNode));
-							buffer.append("_2");
-						} else if (returnNode != null && isFloatingPoint(returnNode)) {
-							buffer.append("_objc_1msgSend_1fpret__");
-						} else {
-							buffer.append("_objc_1msgSend__");
-						}
-						buffer.append("II");
-						NodeList params = method.getChildNodes();
-						for (int k = 0; k < params.getLength(); k++) {
-							Node param = params.item(k);
-							if ("arg".equals(param.getNodeName())) {
-								if (isStruct(param)) {
-									buffer.append("L");
-									buffer.append(packageName);
-									buffer.append("_");
-									buffer.append(getJavaType(param));
-									buffer.append("_2");
-								} else {
-									buffer.append(getJNIType(param));
-								}
-							}
-						}
-						String key = buffer.toString();
-						if (set.get(key) == null) set.put(key, method);
-					}
-				}
-			}
-		}
-	}
-	for (Iterator iterator = set.keySet().iterator(); iterator.hasNext();) {
-		String key = iterator.next().toString();
-		out(key);
-		out("=flags=cast");
-		outln();
-		int count = 2;
-		if (key.indexOf("stret") != -1) {
-			count = 3;
-			out(key);
-			out("_0=");
-			outln();
-			out(key);
-			out("_1=cast=(id)");
-			outln();
-			out(key);
-			out("_2=cast=(SEL)");
-			outln();
-		} else {
-			out(key);
-			out("_0=cast=(id)");
-			outln();
-			out(key);
-			out("_1=cast=(SEL)");
-			outln();
-		}
-		Node method = (Node)set.get(key);
+	for (Iterator iterator = all.keySet().iterator(); iterator.hasNext();) {
+		String key = (String)iterator.next();
+		Node method = (Node)all.get(key);
 		NodeList params = method.getChildNodes();
+		ArrayList tags = new ArrayList();
+		int count = 0;
 		for (int k = 0; k < params.getLength(); k++) {
 			Node param = params.item(k);
 			if ("arg".equals(param.getNodeName())) {
-				out(key);
-				out("_");
-				out(String.valueOf(count));
-				out("=");
 				if (isStruct(param)) {
-					out("flags=struct");
+					tags.add(" * @param arg" + count + " flags=struct");
 				}
-				outln();
 				count++;
 			}
 		}
+		out("/**");
+		if (tags.size() > 0) {
+			outln();
+			out(" *");
+		}
+		out(" @method flags=cast");
+		if (tags.size() > 0) outln();
+		for (Iterator iterator2 = tags.iterator(); iterator2.hasNext();) {
+			String tag = (String) iterator2.next();
+			out(tag);
+			outln();
+		}
+		out(" */");
+		outln();
+		out(key.toString());
 		outln();
 	}
 }
 
-
 String getSelConst(String sel) {
 	return "sel_" + sel.replaceAll(":", "_");
 }
@@ -1370,10 +1212,6 @@ void generateProtocolsConst() {
 	}
 }
 
-String getMetaDataDir() {
-	return "./JNI Generation/org/eclipse/swt/tools/internal/";
-}
-
 String getPackageName(String className) {
 	int dot = mainClassName.lastIndexOf('.');
 	if (dot == -1) return "";
@@ -1540,6 +1378,41 @@ void generateFunctions() {
 				if (getGen(node)) {
 					NamedNodeMap attributes = node.getAttributes();
 					String name = attributes.getNamedItem("name").getNodeValue();
+					NodeList params = node.getChildNodes();
+					int count = 0;
+					for (int j = 0; j < params.getLength(); j++) {
+						Node param = params.item(j);
+						if ("arg".equals(param.getNodeName())) {
+							count++;
+						}
+					}
+					if (count > 0) {
+						out("/**");
+						outln();
+					}
+					for (int j = 0; j < params.getLength(); j++) {
+						Node param = params.item(j);
+						if ("arg".equals(param.getNodeName())) {
+							NamedNodeMap paramAttributes = param.getAttributes();
+							out(" * @param ");
+							out(paramAttributes.getNamedItem("name").getNodeValue());
+							if (isStruct(param)) {
+								out(" flags=struct");
+							} else {
+								out(" cast=");
+								Node declaredType = paramAttributes.getNamedItem("declared_type");
+								String cast = declaredType.getNodeValue();
+								if (!cast.startsWith("(")) out("(");
+								out(cast);
+								if (!cast.endsWith(")")) out(")");
+								outln();
+							}
+						}
+					}
+					if (count > 0) {
+						out(" */");
+						outln();
+					}
 					out("public static final native ");
 					Node returnNode = getReturnNode(node.getChildNodes());
 					if (returnNode != null) {
@@ -1556,7 +1429,7 @@ void generateFunctions() {
 					}
 					out(name);
 					out("(");
-					NodeList params = node.getChildNodes();
+					params = node.getChildNodes();
 					boolean first = true;
 					for (int j = 0; j < params.getLength(); j++) {
 						Node param = params.item(j);
@@ -1616,7 +1489,8 @@ public static void main(String[] args) {
 //		"./Mac Generation/org/eclipse/swt/tools/internal/WebKitFull.bridgesupport",
 //	};
 	try {
-		MacGenerator gen = new MacGenerator(args);
+		MacGenerator gen = new MacGenerator();
+		gen.setXmls(args);
 		gen.setOutputDir("../org.eclipse.swt/Eclipse SWT PI/cocoa/");
 		gen.setMainClass("org.eclipse.swt.internal.cocoa.OS");
 		gen.generateAll();
diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGeneratorUI.java b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGeneratorUI.java
index d1291d7005..37d7d7ddc5 100644
--- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGeneratorUI.java
+++ b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGeneratorUI.java
@@ -27,16 +27,13 @@ import org.eclipse.swt.widgets.*;
 
 public class MacGeneratorUI {
 	MacGenerator gen;
+	boolean actions = true;
 
-	Display display;
-	Shell shell;
 	Tree nodesTree;
 	Table attribTable;
 
-	public MacGeneratorUI(String[] xmls) {
-		gen = new MacGenerator(xmls);
-		gen.setOutputDir("../org.eclipse.swt/Eclipse SWT PI/cocoa/");
-		gen.setMainClass("org.eclipse.swt.internal.cocoa.OS");
+	public MacGeneratorUI(MacGenerator gen) {
+		this.gen = gen;
 	}
 
 	TreeItem lastParent;
@@ -89,6 +86,7 @@ public class MacGeneratorUI {
 	    }
 	    item.setChecked(checked);
 	    item.setGrayed(grayed);
+	    updateGenAttribute(item);
 	    checkPath(item.getParentItem(), checked, grayed);
 	}
 	
@@ -139,24 +137,41 @@ public class MacGeneratorUI {
 			}
 		}
 	}
+	
 	void checkItems(TreeItem item, boolean checked) {
 	    item.setGrayed(false);
 	    item.setChecked(checked);
-	    /*
-	     * Note that this creates the whole tree underneath item
-	     * so that the checked/grayed state can be kept in the
-	     * UI only and updated when generate is called. This can
-	     * be very expensive.
-	     */
-	    checkChildren(item);
+	    updateGenAttribute(item);
 	    TreeItem[] items = item.getItems();
-	    for (int i = 0; i < items.length; i++) {
-	        checkItems(items[i], checked);
+	    if (items.length == 1 && items[0].getData() == null) {
+	    	/* Update model only if view is not created */
+			Node node = (Node)item.getData();
+			NodeList childNodes = node.getChildNodes();
+			for (int i = 0, length = childNodes.getLength(); i < length; i++) {
+				checkNodes(childNodes.item(i), checked);
+			}
+	    } else {
+		    for (int i = 0; i < items.length; i++) {
+		        checkItems(items[i], checked);
+		    }
 	    }
 	}
 	
+	void checkNodes(Node node, boolean checked) {
+		if (node instanceof Element) {
+			if (checked) {
+				((Element)node).setAttribute("swt_gen", "true");
+			} else {
+				((Element)node).removeAttribute("swt_gen");
+			}
+		}
+		NodeList childNodes = node.getChildNodes();
+		for (int i = 0, length = childNodes.getLength(); i < length; i++) {
+			checkNodes(childNodes.item(i), checked);
+		}
+	}
+	
 	void cleanup() {
-		display.dispose();
 	}
 
 	Composite createSignaturesPanel(Composite parent) {
@@ -219,6 +234,7 @@ public class MacGeneratorUI {
 		Composite comp = new Composite(parent, SWT.NONE);
 		GridLayout layout = new GridLayout(1, false);
 		layout.marginWidth = 0;
+		if (!actions) layout.marginRight = 5;
 		comp.setLayout(layout);
 		
 		Label label = new Label(comp, SWT.NONE);
@@ -315,28 +331,32 @@ public class MacGeneratorUI {
 		generate.setText("Generate");
 		generate.addListener(SWT.Selection, new Listener() {
 			public void handleEvent(Event event) {
-				TreeItem[] items = nodesTree.getItems();
-				for (int i = 0; i < items.length; i++) {
-					updateGenAttribute(items[i]);
-				}
-				gen.generateAll();
+				generate();
 			}
 		});
 		return panel;
 	}
 	
-	public void open() {
-		display = new Display();
-		shell = new Shell(display);
-
-		Composite parent = shell;
+	public void generate() {
+		gen.generateAll();
+	}
+	
+	public boolean getActionsVisible() {
+		return actions;
+	}
+	
+	public void open(Composite parent) {
 		FormLayout layout = new FormLayout();
 		parent.setLayout(layout);
 		
 		Composite signaturePanel = createSignaturesPanel(parent);
 		final Sash sash = new Sash(parent, SWT.SMOOTH | SWT.VERTICAL);
 		Composite propertiesPanel = createPropertiesPanel(parent);
-		Composite actionsPanel = createActionsPanel(parent);
+		
+		Composite actionsPanel = null;
+		if (actions) {
+			actionsPanel = createActionsPanel(parent);
+		}
 
 		FormData data;
 		
@@ -348,7 +368,7 @@ public class MacGeneratorUI {
 		signaturePanel.setLayoutData(data);
 		
 		data = new FormData();
-		data.left = new FormAttachment(null, Math.max(200, shell.getSize().x / 2));
+		data.left = new FormAttachment(null, Math.max(200, parent.getSize().x / 2));
 		data.top = new FormAttachment(0, 0);
 		data.bottom = new FormAttachment(100, 0);
 		sash.setLayoutData(data);
@@ -356,15 +376,17 @@ public class MacGeneratorUI {
 		data = new FormData();
 		data.left = new FormAttachment(sash, sash.computeSize(SWT.DEFAULT, SWT.DEFAULT).x);
 		data.top = new FormAttachment(0, 0);
-		data.right = new FormAttachment(actionsPanel, 0);
+		data.right = actionsPanel != null ? new FormAttachment(actionsPanel, 0) : new FormAttachment(100, 0);
 		data.bottom = new FormAttachment(100, 0);
 		propertiesPanel.setLayoutData(data);
 
-		data = new FormData();
-		data.top = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.bottom = new FormAttachment(100, 0);
-		actionsPanel.setLayoutData(data);
+		if (actionsPanel != null) {
+			data = new FormData();
+			data.top = new FormAttachment(0, 0);
+			data.right = new FormAttachment(100, 0);
+			data.bottom = new FormAttachment(100, 0);
+			actionsPanel.setLayoutData(data);
+		}
 		
 		sash.addListener(SWT.Selection, new Listener() {
 			public void handleEvent(Event event) {
@@ -382,12 +404,7 @@ public class MacGeneratorUI {
 		updateNodes();
 	}
 
-	public void run() {
-		shell.open();
-		while (!shell.isDisposed()) {
-			if (!display.readAndDispatch())
-				display.sleep();
-		}
+	public void dispose() {
 		cleanup();
 	}
 	
@@ -434,7 +451,7 @@ public class MacGeneratorUI {
 			}
 			index++;
 		}
-		display.beep();
+		nodesTree.getDisplay().beep();
 	}
 	
 	void selectNode(Node node) {
@@ -490,7 +507,7 @@ public class MacGeneratorUI {
 			TableItem attribItem = new TableItem(attribTable, SWT.NONE);
 			attribItem.setText(extraAttribs[i]);
 			attribItem.setData(node);
-			attribItem.setForeground(display.getSystemColor(SWT.COLOR_BLUE));
+			attribItem.setForeground(item.getDisplay().getSystemColor(SWT.COLOR_BLUE));
 			Node attrib = attributes.getNamedItem(extraAttribs[i]);
 			if (attrib != null) {
 				attribItem.setText(1, attrib.getNodeValue());
@@ -523,10 +540,6 @@ public class MacGeneratorUI {
 				node.removeAttribute("swt_gen");
 			}
 		}
-		TreeItem[] items = item.getItems();
-		for (int i = 0; i < items.length; i++) {
-			updateGenAttribute(items[i]);
-		}
 	}
 	
 	void updateNodes() {
@@ -552,6 +565,14 @@ public class MacGeneratorUI {
 			columns[i].pack();
 		}
 	}
+	
+	public void setActionsVisible(boolean visible) {
+		this.actions = visible;
+	}
+	
+	public void setFocus() {
+		nodesTree.setFocus();
+	}
 
 	public static void main(String[] args) {
 //		args = new String[]{
@@ -560,9 +581,21 @@ public class MacGeneratorUI {
 //			"./Mac Generation/org/eclipse/swt/tools/internal/WebKitFull.bridgesupport",
 //		};
 		try {
-			MacGeneratorUI ui = new MacGeneratorUI(args);
-			ui.open();
-			ui.run();
+			Display display = new Display();
+			Shell shell = new Shell(display);
+			MacGenerator gen = new MacGenerator();
+			gen.setXmls(args);
+			gen.setOutputDir("../org.eclipse.swt/Eclipse SWT PI/cocoa/");
+			gen.setMainClass("org.eclipse.swt.internal.cocoa.OS");
+			MacGeneratorUI ui = new MacGeneratorUI(gen);
+			ui.open(shell);
+			shell.open();
+			while (!shell.isDisposed()) {
+				if (!display.readAndDispatch())
+					display.sleep();
+			}
+			ui.dispose();
+			display.dispose();
 		} catch (Throwable e) {
 			e.printStackTrace();
 		}
diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/WebKitFull.bridgesupport b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/WebKitFull.bridgesupport
deleted file mode 100644
index 4bf5c8831f..0000000000
--- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/WebKitFull.bridgesupport
+++ /dev/null
@@ -1,5156 +0,0 @@
-<?xml version='1.0'?>
-<signatures version='0.9'>
-  <depends_on path='/System/Library/Frameworks/Carbon.framework'/>
-  <depends_on path='/System/Library/Frameworks/Cocoa.framework'/>
-  <depends_on path='/System/Library/Frameworks/JavaScriptCore.framework'/>
-  <depends_on path='/System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework'/>
-  <depends_on path='/System/Library/Frameworks/Security.framework'/>
-  <depends_on path='/System/Library/Frameworks/CoreServices.framework'/>
-  <depends_on path='/System/Library/Frameworks/CoreFoundation.framework'/>
-  <depends_on path='/System/Library/Frameworks/AppKit.framework'/>
-  <depends_on path='/System/Library/Frameworks/ApplicationServices.framework'/>
-  <depends_on path='/System/Library/Frameworks/Foundation.framework'/>
-  <constant name='DOMEventException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='DOMException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='DOMRangeException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='DOMXPathException' declared_type='NSString*' type='@' const='true'/>
-  <constant name='WebActionButtonKey' declared_type='NSString*' type='@'/>
-  <constant name='WebActionElementKey' declared_type='NSString*' type='@'/>
-  <constant name='WebActionModifierFlagsKey' declared_type='NSString*' type='@'/>
-  <constant name='WebActionNavigationTypeKey' declared_type='NSString*' type='@'/>
-  <constant name='WebActionOriginalURLKey' declared_type='NSString*' type='@'/>
-  <constant name='WebArchivePboardType' declared_type='NSString*' type='@'/>
-  <constant name='WebElementDOMNodeKey' declared_type='NSString*' type='@'/>
-  <constant name='WebElementFrameKey' declared_type='NSString*' type='@'/>
-  <constant name='WebElementImageAltStringKey' declared_type='NSString*' type='@'/>
-  <constant name='WebElementImageKey' declared_type='NSString*' type='@'/>
-  <constant name='WebElementImageRectKey' declared_type='NSString*' type='@'/>
-  <constant name='WebElementImageURLKey' declared_type='NSString*' type='@'/>
-  <constant name='WebElementIsSelectedKey' declared_type='NSString*' type='@'/>
-  <constant name='WebElementLinkLabelKey' declared_type='NSString*' type='@'/>
-  <constant name='WebElementLinkTargetFrameKey' declared_type='NSString*' type='@'/>
-  <constant name='WebElementLinkTitleKey' declared_type='NSString*' type='@'/>
-  <constant name='WebElementLinkURLKey' declared_type='NSString*' type='@'/>
-  <constant name='WebHistoryAllItemsRemovedNotification' declared_type='NSString*' type='@'/>
-  <constant name='WebHistoryItemChangedNotification' declared_type='NSString*' type='@'/>
-  <constant name='WebHistoryItemsAddedNotification' declared_type='NSString*' type='@'/>
-  <constant name='WebHistoryItemsKey' declared_type='NSString*' type='@'/>
-  <constant name='WebHistoryItemsRemovedNotification' declared_type='NSString*' type='@'/>
-  <constant name='WebHistoryLoadedNotification' declared_type='NSString*' type='@'/>
-  <constant name='WebHistorySavedNotification' declared_type='NSString*' type='@'/>
-  <constant name='WebKitErrorDomain' declared_type='NSString*' type='@'/>
-  <constant name='WebKitErrorMIMETypeKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='WebKitErrorPlugInNameKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='WebKitErrorPlugInPageURLStringKey' declared_type='NSString*' type='@' const='true'/>
-  <constant name='WebPlugInAttributesKey' declared_type='NSString*' type='@'/>
-  <constant name='WebPlugInBaseURLKey' declared_type='NSString*' type='@'/>
-  <constant name='WebPlugInContainerKey' declared_type='NSString*' type='@'/>
-  <constant name='WebPlugInContainingElementKey' declared_type='NSString*' type='@'/>
-  <constant name='WebPreferencesChangedNotification' declared_type='NSString*' type='@'/>
-  <constant name='WebViewDidBeginEditingNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='WebViewDidChangeNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='WebViewDidChangeSelectionNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='WebViewDidChangeTypingStyleNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='WebViewDidEndEditingNotification' declared_type='NSString*' type='@' const='true'/>
-  <constant name='WebViewProgressEstimateChangedNotification' declared_type='NSString*' type='@'/>
-  <constant name='WebViewProgressFinishedNotification' declared_type='NSString*' type='@'/>
-  <constant name='WebViewProgressStartedNotification' declared_type='NSString*' type='@'/>
-  <enum name='DOM_ADDITION' value='2'/>
-  <enum name='DOM_ANY_TYPE' value='0'/>
-  <enum name='DOM_ANY_UNORDERED_NODE_TYPE' value='8'/>
-  <enum name='DOM_ATTRIBUTE_NODE' value='2'/>
-  <enum name='DOM_AT_TARGET' value='2'/>
-  <enum name='DOM_BAD_BOUNDARYPOINTS_ERR' value='1'/>
-  <enum name='DOM_BOOLEAN_TYPE' value='3'/>
-  <enum name='DOM_BOTH' value='2'/>
-  <enum name='DOM_BUBBLING_PHASE' value='3'/>
-  <enum name='DOM_CAPTURING_PHASE' value='1'/>
-  <enum name='DOM_CDATA_SECTION_NODE' value='4'/>
-  <enum name='DOM_CHARSET_RULE' value='2'/>
-  <enum name='DOM_COMMENT_NODE' value='8'/>
-  <enum name='DOM_CSS_ATTR' value='22'/>
-  <enum name='DOM_CSS_CM' value='6'/>
-  <enum name='DOM_CSS_COUNTER' value='23'/>
-  <enum name='DOM_CSS_CUSTOM' value='3'/>
-  <enum name='DOM_CSS_DEG' value='11'/>
-  <enum name='DOM_CSS_DIMENSION' value='18'/>
-  <enum name='DOM_CSS_EMS' value='3'/>
-  <enum name='DOM_CSS_EXS' value='4'/>
-  <enum name='DOM_CSS_GRAD' value='13'/>
-  <enum name='DOM_CSS_HZ' value='16'/>
-  <enum name='DOM_CSS_IDENT' value='21'/>
-  <enum name='DOM_CSS_IN' value='8'/>
-  <enum name='DOM_CSS_INHERIT' value='0'/>
-  <enum name='DOM_CSS_KHZ' value='17'/>
-  <enum name='DOM_CSS_MM' value='7'/>
-  <enum name='DOM_CSS_MS' value='14'/>
-  <enum name='DOM_CSS_NUMBER' value='1'/>
-  <enum name='DOM_CSS_PC' value='10'/>
-  <enum name='DOM_CSS_PERCENTAGE' value='2'/>
-  <enum name='DOM_CSS_PRIMITIVE_VALUE' value='1'/>
-  <enum name='DOM_CSS_PT' value='9'/>
-  <enum name='DOM_CSS_PX' value='5'/>
-  <enum name='DOM_CSS_RAD' value='12'/>
-  <enum name='DOM_CSS_RECT' value='24'/>
-  <enum name='DOM_CSS_RGBCOLOR' value='25'/>
-  <enum name='DOM_CSS_S' value='15'/>
-  <enum name='DOM_CSS_STRING' value='19'/>
-  <enum name='DOM_CSS_UNKNOWN' value='0'/>
-  <enum name='DOM_CSS_URI' value='20'/>
-  <enum name='DOM_CSS_VALUE_LIST' value='2'/>
-  <enum name='DOM_DOCUMENT_FRAGMENT_NODE' value='11'/>
-  <enum name='DOM_DOCUMENT_NODE' value='9'/>
-  <enum name='DOM_DOCUMENT_TYPE_NODE' value='10'/>
-  <enum name='DOM_DOMSTRING_SIZE_ERR' value='2'/>
-  <enum name='DOM_ELEMENT_NODE' value='1'/>
-  <enum name='DOM_END_TO_END' value='2'/>
-  <enum name='DOM_END_TO_START' value='3'/>
-  <enum name='DOM_ENTITY_NODE' value='6'/>
-  <enum name='DOM_ENTITY_REFERENCE_NODE' value='5'/>
-  <enum name='DOM_FILTER_ACCEPT' value='1'/>
-  <enum name='DOM_FILTER_REJECT' value='2'/>
-  <enum name='DOM_FILTER_SKIP' value='3'/>
-  <enum name='DOM_FIRST_ORDERED_NODE_TYPE' value='9'/>
-  <enum name='DOM_FONT_FACE_RULE' value='5'/>
-  <enum name='DOM_HIERARCHY_REQUEST_ERR' value='3'/>
-  <enum name='DOM_HORIZONTAL' value='0'/>
-  <enum name='DOM_IMPORT_RULE' value='3'/>
-  <enum name='DOM_INDEX_SIZE_ERR' value='1'/>
-  <enum name='DOM_INUSE_ATTRIBUTE_ERR' value='10'/>
-  <enum name='DOM_INVALID_ACCESS_ERR' value='15'/>
-  <enum name='DOM_INVALID_CHARACTER_ERR' value='5'/>
-  <enum name='DOM_INVALID_EXPRESSION_ERR' value='51'/>
-  <enum name='DOM_INVALID_MODIFICATION_ERR' value='13'/>
-  <enum name='DOM_INVALID_NODE_TYPE_ERR' value='2'/>
-  <enum name='DOM_INVALID_STATE_ERR' value='11'/>
-  <enum name='DOM_KEY_LOCATION_LEFT' value='1'/>
-  <enum name='DOM_KEY_LOCATION_NUMPAD' value='3'/>
-  <enum name='DOM_KEY_LOCATION_RIGHT' value='2'/>
-  <enum name='DOM_KEY_LOCATION_STANDARD' value='0'/>
-  <enum name='DOM_MEDIA_RULE' value='4'/>
-  <enum name='DOM_MODIFICATION' value='1'/>
-  <enum name='DOM_NAMESPACE_ERR' value='14'/>
-  <enum name='DOM_NODE_AFTER' value='1'/>
-  <enum name='DOM_NODE_BEFORE' value='0'/>
-  <enum name='DOM_NODE_BEFORE_AND_AFTER' value='2'/>
-  <enum name='DOM_NODE_INSIDE' value='3'/>
-  <enum name='DOM_NOTATION_NODE' value='12'/>
-  <enum name='DOM_NOT_FOUND_ERR' value='8'/>
-  <enum name='DOM_NOT_SUPPORTED_ERR' value='9'/>
-  <enum name='DOM_NO_DATA_ALLOWED_ERR' value='6'/>
-  <enum name='DOM_NO_MODIFICATION_ALLOWED_ERR' value='7'/>
-  <enum name='DOM_NUMBER_TYPE' value='1'/>
-  <enum name='DOM_ORDERED_NODE_ITERATOR_TYPE' value='5'/>
-  <enum name='DOM_ORDERED_NODE_SNAPSHOT_TYPE' value='7'/>
-  <enum name='DOM_PAGE_RULE' value='6'/>
-  <enum name='DOM_PROCESSING_INSTRUCTION_NODE' value='7'/>
-  <enum name='DOM_REMOVAL' value='3'/>
-  <enum name='DOM_SHOW_ALL' value='-1'/>
-  <enum name='DOM_SHOW_ATTRIBUTE' value='2'/>
-  <enum name='DOM_SHOW_CDATA_SECTION' value='8'/>
-  <enum name='DOM_SHOW_COMMENT' value='128'/>
-  <enum name='DOM_SHOW_DOCUMENT' value='256'/>
-  <enum name='DOM_SHOW_DOCUMENT_FRAGMENT' value='1024'/>
-  <enum name='DOM_SHOW_DOCUMENT_TYPE' value='512'/>
-  <enum name='DOM_SHOW_ELEMENT' value='1'/>
-  <enum name='DOM_SHOW_ENTITY' value='32'/>
-  <enum name='DOM_SHOW_ENTITY_REFERENCE' value='16'/>
-  <enum name='DOM_SHOW_NOTATION' value='2048'/>
-  <enum name='DOM_SHOW_PROCESSING_INSTRUCTION' value='64'/>
-  <enum name='DOM_SHOW_TEXT' value='4'/>
-  <enum name='DOM_START_TO_END' value='1'/>
-  <enum name='DOM_START_TO_START' value='0'/>
-  <enum name='DOM_STRING_TYPE' value='2'/>
-  <enum name='DOM_STYLE_RULE' value='1'/>
-  <enum name='DOM_SYNTAX_ERR' value='12'/>
-  <enum name='DOM_TEXT_NODE' value='3'/>
-  <enum name='DOM_TYPE_ERR' value='52'/>
-  <enum name='DOM_UNKNOWN_RULE' value='0'/>
-  <enum name='DOM_UNORDERED_NODE_ITERATOR_TYPE' value='4'/>
-  <enum name='DOM_UNORDERED_NODE_SNAPSHOT_TYPE' value='6'/>
-  <enum name='DOM_UNSPECIFIED_EVENT_TYPE_ERR' value='0'/>
-  <enum name='DOM_VERTICAL' value='1'/>
-  <enum name='DOM_WRONG_DOCUMENT_ERR' value='4'/>
-  <enum name='WebCacheModelDocumentBrowser' value='1'/>
-  <enum name='WebCacheModelDocumentViewer' value='0'/>
-  <enum name='WebCacheModelPrimaryWebBrowser' value='2'/>
-  <enum name='WebDragDestinationActionAny' value='-1'/>
-  <enum name='WebDragDestinationActionDHTML' value='1'/>
-  <enum name='WebDragDestinationActionEdit' value='2'/>
-  <enum name='WebDragDestinationActionLoad' value='4'/>
-  <enum name='WebDragDestinationActionNone' value='0'/>
-  <enum name='WebDragSourceActionAny' value='-1'/>
-  <enum name='WebDragSourceActionDHTML' value='1'/>
-  <enum name='WebDragSourceActionImage' value='2'/>
-  <enum name='WebDragSourceActionLink' value='4'/>
-  <enum name='WebDragSourceActionNone' value='0'/>
-  <enum name='WebDragSourceActionSelection' value='8'/>
-  <enum name='WebJNIReturnTypeBoolean' value='3'/>
-  <enum name='WebJNIReturnTypeByte' value='4'/>
-  <enum name='WebJNIReturnTypeChar' value='5'/>
-  <enum name='WebJNIReturnTypeDouble' value='10'/>
-  <enum name='WebJNIReturnTypeFloat' value='9'/>
-  <enum name='WebJNIReturnTypeInt' value='7'/>
-  <enum name='WebJNIReturnTypeInvalid' value='0'/>
-  <enum name='WebJNIReturnTypeLong' value='8'/>
-  <enum name='WebJNIReturnTypeObject' value='2'/>
-  <enum name='WebJNIReturnTypeShort' value='6'/>
-  <enum name='WebJNIReturnTypeVoid' value='1'/>
-  <enum name='WebKitErrorCannotFindPlugIn' value='200'/>
-  <enum name='WebKitErrorCannotLoadPlugIn' value='201'/>
-  <enum name='WebKitErrorCannotShowMIMEType' value='100'/>
-  <enum name='WebKitErrorCannotShowURL' value='101'/>
-  <enum name='WebKitErrorFrameLoadInterruptedByPolicyChange' value='102'/>
-  <enum name='WebKitErrorJavaUnavailable' value='202'/>
-  <enum name='WebMenuItemPDFActualSize' value='24'/>
-  <enum name='WebMenuItemPDFAutoSize' value='27'/>
-  <enum name='WebMenuItemPDFContinuous' value='30'/>
-  <enum name='WebMenuItemPDFFacingPages' value='29'/>
-  <enum name='WebMenuItemPDFNextPage' value='31'/>
-  <enum name='WebMenuItemPDFPreviousPage' value='32'/>
-  <enum name='WebMenuItemPDFSinglePage' value='28'/>
-  <enum name='WebMenuItemPDFZoomIn' value='25'/>
-  <enum name='WebMenuItemPDFZoomOut' value='26'/>
-  <enum name='WebMenuItemTagCopy' value='8'/>
-  <enum name='WebMenuItemTagCopyImageToClipboard' value='6'/>
-  <enum name='WebMenuItemTagCopyLinkToClipboard' value='3'/>
-  <enum name='WebMenuItemTagCut' value='13'/>
-  <enum name='WebMenuItemTagDownloadImageToDisk' value='5'/>
-  <enum name='WebMenuItemTagDownloadLinkToDisk' value='2'/>
-  <enum name='WebMenuItemTagGoBack' value='9'/>
-  <enum name='WebMenuItemTagGoForward' value='10'/>
-  <enum name='WebMenuItemTagIgnoreSpelling' value='17'/>
-  <enum name='WebMenuItemTagLearnSpelling' value='18'/>
-  <enum name='WebMenuItemTagLookUpInDictionary' value='22'/>
-  <enum name='WebMenuItemTagNoGuessesFound' value='16'/>
-  <enum name='WebMenuItemTagOpenFrameInNewWindow' value='7'/>
-  <enum name='WebMenuItemTagOpenImageInNewWindow' value='4'/>
-  <enum name='WebMenuItemTagOpenLinkInNewWindow' value='1'/>
-  <enum name='WebMenuItemTagOpenWithDefaultApplication' value='23'/>
-  <enum name='WebMenuItemTagOther' value='19'/>
-  <enum name='WebMenuItemTagPaste' value='14'/>
-  <enum name='WebMenuItemTagReload' value='12'/>
-  <enum name='WebMenuItemTagSearchInSpotlight' value='20'/>
-  <enum name='WebMenuItemTagSearchWeb' value='21'/>
-  <enum name='WebMenuItemTagSpellingGuess' value='15'/>
-  <enum name='WebMenuItemTagStop' value='11'/>
-  <enum name='WebNavigationTypeBackForward' value='2'/>
-  <enum name='WebNavigationTypeFormResubmitted' value='4'/>
-  <enum name='WebNavigationTypeFormSubmitted' value='1'/>
-  <enum name='WebNavigationTypeLinkClicked' value='0'/>
-  <enum name='WebNavigationTypeOther' value='5'/>
-  <enum name='WebNavigationTypeReload' value='3'/>
-  <enum name='WebViewInsertActionDropped' value='2'/>
-  <enum name='WebViewInsertActionPasted' value='1'/>
-  <enum name='WebViewInsertActionTyped' value='0'/>
-  <function name='HIWebViewCreate'>
-    <arg name='outControl' declared_type='HIViewRef*' type='^^{OpaqueControlRef}' type_modifier='n'/>
-    <retval declared_type='OSStatus' type='l'/>
-  </function>
-  <function name='WebInitForCarbon'/>
-  <class name='DOMAttr'>
-    <method selector='specified'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='DOMCSSMediaRule'>
-    <method selector='deleteRule:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertRule::'>
-      <arg name='insertRule' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='unsigned' type='I' index='1'/>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-    <method selector='insertRule:index:'>
-      <arg name='rule' declared_type='NSString*' type='@' index='0'/>
-      <arg name='index' declared_type='unsigned' type='I' index='1'/>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-  </class>
-  <class name='DOMCSSPrimitiveValue'>
-    <method selector='getCounterValue'>
-      <retval declared_type='DOMCounter*' type='@'/>
-    </method>
-    <method selector='getFloatValue:'>
-      <arg name='unitType' declared_type='unsigned short' type='S' index='0'/>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='getRGBColorValue'>
-      <retval declared_type='DOMRGBColor*' type='@'/>
-    </method>
-    <method selector='getRectValue'>
-      <retval declared_type='DOMRect*' type='@'/>
-    </method>
-    <method selector='getStringValue'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='primitiveType'>
-      <retval declared_type='unsigned short' type='S'/>
-    </method>
-    <method selector='setFloatValue::'>
-      <arg name='setFloatValue' declared_type='unsigned short' type='S' index='0'/>
-      <arg name='' declared_type='float' type='f' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFloatValue:floatValue:'>
-      <arg name='unitType' declared_type='unsigned short' type='S' index='0'/>
-      <arg name='floatValue' declared_type='float' type='f' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStringValue::'>
-      <arg name='setStringValue' declared_type='unsigned short' type='S' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStringValue:stringValue:'>
-      <arg name='stringType' declared_type='unsigned short' type='S' index='0'/>
-      <arg name='stringValue' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMCSSRule'>
-    <method selector='type'>
-      <retval declared_type='unsigned short' type='S'/>
-    </method>
-  </class>
-  <class name='DOMCSSRuleList'>
-    <method selector='item:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='DOMCSSRule*' type='@'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-  </class>
-  <class name='DOMCSSStyleDeclaration'>
-    <method selector='azimuth'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='background'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='backgroundAttachment'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='backgroundColor'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='backgroundImage'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='backgroundPosition'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='backgroundRepeat'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='border'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderBottom'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderBottomColor'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderBottomStyle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderBottomWidth'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderCollapse'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderColor'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderLeft'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderLeftColor'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderLeftStyle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderLeftWidth'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderRight'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderRightColor'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderRightStyle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderRightWidth'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderSpacing'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderStyle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderTop'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderTopColor'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderTopStyle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderTopWidth'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='borderWidth'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='bottom'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='captionSide'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='clear'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='clip'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='color'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='content'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='counterIncrement'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='counterReset'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='cssFloat'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='cue'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='cueAfter'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='cueBefore'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='cursor'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='direction'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='display'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='elevation'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='emptyCells'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='font'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fontFamily'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fontSize'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fontSizeAdjust'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fontStretch'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fontStyle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fontVariant'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fontWeight'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='getPropertyCSSValue:'>
-      <arg name='propertyName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMCSSValue*' type='@'/>
-    </method>
-    <method selector='getPropertyPriority:'>
-      <arg name='propertyName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='getPropertyShorthand:'>
-      <arg name='propertyName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='getPropertyValue:'>
-      <arg name='propertyName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='height'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='isPropertyImplicit:'>
-      <arg name='propertyName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='item:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='left'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-    <method selector='letterSpacing'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='lineHeight'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='listStyle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='listStyleImage'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='listStylePosition'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='listStyleType'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='margin'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='marginBottom'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='marginLeft'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='marginRight'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='marginTop'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='markerOffset'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='marks'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='maxHeight'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='maxWidth'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='minHeight'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='minWidth'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='orphans'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='outline'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='outlineColor'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='outlineStyle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='outlineWidth'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='overflow'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='padding'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='paddingBottom'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='paddingLeft'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='paddingRight'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='paddingTop'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='page'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pageBreakAfter'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pageBreakBefore'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pageBreakInside'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pause'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pauseAfter'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pauseBefore'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pitch'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='pitchRange'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='playDuring'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='position'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='quotes'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='removeProperty:'>
-      <arg name='propertyName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='richness'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='right'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setAzimuth:'>
-      <arg name='azimuth' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackground:'>
-      <arg name='background' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundAttachment:'>
-      <arg name='backgroundAttachment' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundColor:'>
-      <arg name='backgroundColor' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundImage:'>
-      <arg name='backgroundImage' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundPosition:'>
-      <arg name='backgroundPosition' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBackgroundRepeat:'>
-      <arg name='backgroundRepeat' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorder:'>
-      <arg name='border' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderBottom:'>
-      <arg name='borderBottom' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderBottomColor:'>
-      <arg name='borderBottomColor' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderBottomStyle:'>
-      <arg name='borderBottomStyle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderBottomWidth:'>
-      <arg name='borderBottomWidth' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderCollapse:'>
-      <arg name='borderCollapse' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderColor:'>
-      <arg name='borderColor' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderLeft:'>
-      <arg name='borderLeft' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderLeftColor:'>
-      <arg name='borderLeftColor' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderLeftStyle:'>
-      <arg name='borderLeftStyle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderLeftWidth:'>
-      <arg name='borderLeftWidth' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderRight:'>
-      <arg name='borderRight' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderRightColor:'>
-      <arg name='borderRightColor' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderRightStyle:'>
-      <arg name='borderRightStyle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderRightWidth:'>
-      <arg name='borderRightWidth' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderSpacing:'>
-      <arg name='borderSpacing' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderStyle:'>
-      <arg name='borderStyle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderTop:'>
-      <arg name='borderTop' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderTopColor:'>
-      <arg name='borderTopColor' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderTopStyle:'>
-      <arg name='borderTopStyle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderTopWidth:'>
-      <arg name='borderTopWidth' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBorderWidth:'>
-      <arg name='borderWidth' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setBottom:'>
-      <arg name='bottom' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCaptionSide:'>
-      <arg name='captionSide' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setClear:'>
-      <arg name='clear' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setClip:'>
-      <arg name='clip' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setColor:'>
-      <arg name='color' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContent:'>
-      <arg name='content' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCounterIncrement:'>
-      <arg name='counterIncrement' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCounterReset:'>
-      <arg name='counterReset' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCssFloat:'>
-      <arg name='cssFloat' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCue:'>
-      <arg name='cue' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCueAfter:'>
-      <arg name='cueAfter' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCueBefore:'>
-      <arg name='cueBefore' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCursor:'>
-      <arg name='cursor' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDirection:'>
-      <arg name='direction' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDisplay:'>
-      <arg name='display' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setElevation:'>
-      <arg name='elevation' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEmptyCells:'>
-      <arg name='emptyCells' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFont:'>
-      <arg name='font' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFontFamily:'>
-      <arg name='fontFamily' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFontSize:'>
-      <arg name='fontSize' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFontSizeAdjust:'>
-      <arg name='fontSizeAdjust' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFontStretch:'>
-      <arg name='fontStretch' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFontStyle:'>
-      <arg name='fontStyle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFontVariant:'>
-      <arg name='fontVariant' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFontWeight:'>
-      <arg name='fontWeight' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHeight:'>
-      <arg name='height' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLeft:'>
-      <arg name='left' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLetterSpacing:'>
-      <arg name='letterSpacing' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLineHeight:'>
-      <arg name='lineHeight' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setListStyle:'>
-      <arg name='listStyle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setListStyleImage:'>
-      <arg name='listStyleImage' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setListStylePosition:'>
-      <arg name='listStylePosition' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setListStyleType:'>
-      <arg name='listStyleType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMargin:'>
-      <arg name='margin' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMarginBottom:'>
-      <arg name='marginBottom' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMarginLeft:'>
-      <arg name='marginLeft' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMarginRight:'>
-      <arg name='marginRight' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMarginTop:'>
-      <arg name='marginTop' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMarkerOffset:'>
-      <arg name='markerOffset' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMarks:'>
-      <arg name='marks' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxHeight:'>
-      <arg name='maxHeight' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxWidth:'>
-      <arg name='maxWidth' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinHeight:'>
-      <arg name='minHeight' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinWidth:'>
-      <arg name='minWidth' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOrphans:'>
-      <arg name='orphans' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOutline:'>
-      <arg name='outline' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOutlineColor:'>
-      <arg name='outlineColor' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOutlineStyle:'>
-      <arg name='outlineStyle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOutlineWidth:'>
-      <arg name='outlineWidth' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setOverflow:'>
-      <arg name='overflow' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPadding:'>
-      <arg name='padding' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPaddingBottom:'>
-      <arg name='paddingBottom' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPaddingLeft:'>
-      <arg name='paddingLeft' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPaddingRight:'>
-      <arg name='paddingRight' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPaddingTop:'>
-      <arg name='paddingTop' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPage:'>
-      <arg name='page' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPageBreakAfter:'>
-      <arg name='pageBreakAfter' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPageBreakBefore:'>
-      <arg name='pageBreakBefore' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPageBreakInside:'>
-      <arg name='pageBreakInside' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPause:'>
-      <arg name='pause' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPauseAfter:'>
-      <arg name='pauseAfter' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPauseBefore:'>
-      <arg name='pauseBefore' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPitch:'>
-      <arg name='pitch' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPitchRange:'>
-      <arg name='pitchRange' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPlayDuring:'>
-      <arg name='playDuring' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPosition:'>
-      <arg name='position' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setProperty:::'>
-      <arg name='setProperty' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <arg name='' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setProperty:value:priority:'>
-      <arg name='propertyName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='value' declared_type='NSString*' type='@' index='1'/>
-      <arg name='priority' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setQuotes:'>
-      <arg name='quotes' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRichness:'>
-      <arg name='richness' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRight:'>
-      <arg name='right' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSize:'>
-      <arg name='size' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSpeak:'>
-      <arg name='speak' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSpeakHeader:'>
-      <arg name='speakHeader' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSpeakNumeral:'>
-      <arg name='speakNumeral' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSpeakPunctuation:'>
-      <arg name='speakPunctuation' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSpeechRate:'>
-      <arg name='speechRate' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStress:'>
-      <arg name='stress' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTableLayout:'>
-      <arg name='tableLayout' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextAlign:'>
-      <arg name='textAlign' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextDecoration:'>
-      <arg name='textDecoration' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextIndent:'>
-      <arg name='textIndent' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextShadow:'>
-      <arg name='textShadow' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextTransform:'>
-      <arg name='textTransform' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTop:'>
-      <arg name='top' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUnicodeBidi:'>
-      <arg name='unicodeBidi' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVerticalAlign:'>
-      <arg name='verticalAlign' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVisibility:'>
-      <arg name='visibility' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVoiceFamily:'>
-      <arg name='voiceFamily' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVolume:'>
-      <arg name='volume' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWhiteSpace:'>
-      <arg name='whiteSpace' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWidows:'>
-      <arg name='widows' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWidth:'>
-      <arg name='width' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWordSpacing:'>
-      <arg name='wordSpacing' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setZIndex:'>
-      <arg name='zIndex' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='size'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='speak'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='speakHeader'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='speakNumeral'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='speakPunctuation'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='speechRate'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='stress'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='tableLayout'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='textAlign'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='textDecoration'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='textIndent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='textShadow'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='textTransform'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='top'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='unicodeBidi'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='verticalAlign'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='visibility'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='voiceFamily'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='volume'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='whiteSpace'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='widows'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='width'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='wordSpacing'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='zIndex'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='DOMCSSStyleSheet'>
-    <method selector='deleteRule:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertRule::'>
-      <arg name='insertRule' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='unsigned' type='I' index='1'/>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-    <method selector='insertRule:index:'>
-      <arg name='rule' declared_type='NSString*' type='@' index='0'/>
-      <arg name='index' declared_type='unsigned' type='I' index='1'/>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-  </class>
-  <class name='DOMCSSValue'>
-    <method selector='cssValueType'>
-      <retval declared_type='unsigned short' type='S'/>
-    </method>
-  </class>
-  <class name='DOMCSSValueList'>
-    <method selector='item:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='DOMCSSValue*' type='@'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-  </class>
-  <class name='DOMCharacterData'>
-    <method selector='appendData:'>
-      <arg name='data' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteData::'>
-      <arg name='deleteData' declared_type='unsigned' type='I' index='0'/>
-      <arg name='' declared_type='unsigned' type='I' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteData:length:'>
-      <arg name='offset' declared_type='unsigned' type='I' index='0'/>
-      <arg name='length' declared_type='unsigned' type='I' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertData::'>
-      <arg name='insertData' declared_type='unsigned' type='I' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertData:data:'>
-      <arg name='offset' declared_type='unsigned' type='I' index='0'/>
-      <arg name='data' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-    <method selector='replaceData:::'>
-      <arg name='replaceData' declared_type='unsigned' type='I' index='0'/>
-      <arg name='' declared_type='unsigned' type='I' index='1'/>
-      <arg name='' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceData:length:data:'>
-      <arg name='offset' declared_type='unsigned' type='I' index='0'/>
-      <arg name='length' declared_type='unsigned' type='I' index='1'/>
-      <arg name='data' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='substringData::'>
-      <arg name='substringData' declared_type='unsigned' type='I' index='0'/>
-      <arg name='' declared_type='unsigned' type='I' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='substringData:length:'>
-      <arg name='offset' declared_type='unsigned' type='I' index='0'/>
-      <arg name='length' declared_type='unsigned' type='I' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='DOMDocument'>
-    <method selector='URLWithAttributeString:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='adoptNode:'>
-      <arg name='source' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='createAttribute:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMAttr*' type='@'/>
-    </method>
-    <method selector='createAttributeNS::'>
-      <arg name='createAttributeNS' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMAttr*' type='@'/>
-    </method>
-    <method selector='createAttributeNS:qualifiedName:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <arg name='qualifiedName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMAttr*' type='@'/>
-    </method>
-    <method selector='createCDATASection:'>
-      <arg name='data' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMCDATASection*' type='@'/>
-    </method>
-    <method selector='createCSSStyleDeclaration'>
-      <retval declared_type='DOMCSSStyleDeclaration*' type='@'/>
-    </method>
-    <method selector='createComment:'>
-      <arg name='data' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMComment*' type='@'/>
-    </method>
-    <method selector='createDocumentFragment'>
-      <retval declared_type='DOMDocumentFragment*' type='@'/>
-    </method>
-    <method selector='createElement:'>
-      <arg name='tagName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMElement*' type='@'/>
-    </method>
-    <method selector='createElementNS::'>
-      <arg name='createElementNS' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMElement*' type='@'/>
-    </method>
-    <method selector='createElementNS:qualifiedName:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <arg name='qualifiedName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMElement*' type='@'/>
-    </method>
-    <method selector='createEntityReference:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMEntityReference*' type='@'/>
-    </method>
-    <method selector='createEvent:'>
-      <arg name='eventType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMEvent*' type='@'/>
-    </method>
-    <method selector='createExpression::'>
-      <arg name='createExpression' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='id &lt;DOMXPathNSResolver&gt;' type='@' index='1'/>
-      <retval declared_type='DOMXPathExpression*' type='@'/>
-    </method>
-    <method selector='createExpression:resolver:'>
-      <arg name='expression' declared_type='NSString*' type='@' index='0'/>
-      <arg name='resolver' declared_type='id &lt;DOMXPathNSResolver&gt;' type='@' index='1'/>
-      <retval declared_type='DOMXPathExpression*' type='@'/>
-    </method>
-    <method selector='createNSResolver:'>
-      <arg name='nodeResolver' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='id &lt;DOMXPathNSResolver&gt;' type='@'/>
-    </method>
-    <method selector='createNodeIterator::::'>
-      <arg name='createNodeIterator' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='' declared_type='unsigned' type='I' index='1'/>
-      <arg name='' declared_type='id &lt;DOMNodeFilter&gt;' type='@' index='2'/>
-      <arg name='' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='DOMNodeIterator*' type='@'/>
-    </method>
-    <method selector='createNodeIterator:whatToShow:filter:expandEntityReferences:'>
-      <arg name='root' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='whatToShow' declared_type='unsigned' type='I' index='1'/>
-      <arg name='filter' declared_type='id &lt;DOMNodeFilter&gt;' type='@' index='2'/>
-      <arg name='expandEntityReferences' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='DOMNodeIterator*' type='@'/>
-    </method>
-    <method selector='createProcessingInstruction::'>
-      <arg name='createProcessingInstruction' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMProcessingInstruction*' type='@'/>
-    </method>
-    <method selector='createProcessingInstruction:data:'>
-      <arg name='target' declared_type='NSString*' type='@' index='0'/>
-      <arg name='data' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMProcessingInstruction*' type='@'/>
-    </method>
-    <method selector='createRange'>
-      <retval declared_type='DOMRange*' type='@'/>
-    </method>
-    <method selector='createTextNode:'>
-      <arg name='data' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMText*' type='@'/>
-    </method>
-    <method selector='createTreeWalker::::'>
-      <arg name='createTreeWalker' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='' declared_type='unsigned' type='I' index='1'/>
-      <arg name='' declared_type='id &lt;DOMNodeFilter&gt;' type='@' index='2'/>
-      <arg name='' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='DOMTreeWalker*' type='@'/>
-    </method>
-    <method selector='createTreeWalker:whatToShow:filter:expandEntityReferences:'>
-      <arg name='root' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='whatToShow' declared_type='unsigned' type='I' index='1'/>
-      <arg name='filter' declared_type='id &lt;DOMNodeFilter&gt;' type='@' index='2'/>
-      <arg name='expandEntityReferences' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='DOMTreeWalker*' type='@'/>
-    </method>
-    <method selector='evaluate:::::'>
-      <arg name='evaluate' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='DOMNode*' type='@' index='1'/>
-      <arg name='' declared_type='id &lt;DOMXPathNSResolver&gt;' type='@' index='2'/>
-      <arg name='' declared_type='unsigned short' type='S' index='3'/>
-      <arg name='' declared_type='DOMXPathResult*' type='@' index='4'/>
-      <retval declared_type='DOMXPathResult*' type='@'/>
-    </method>
-    <method selector='evaluate:contextNode:resolver:type:inResult:'>
-      <arg name='expression' declared_type='NSString*' type='@' index='0'/>
-      <arg name='contextNode' declared_type='DOMNode*' type='@' index='1'/>
-      <arg name='resolver' declared_type='id &lt;DOMXPathNSResolver&gt;' type='@' index='2'/>
-      <arg name='type' declared_type='unsigned short' type='S' index='3'/>
-      <arg name='inResult' declared_type='DOMXPathResult*' type='@' index='4'/>
-      <retval declared_type='DOMXPathResult*' type='@'/>
-    </method>
-    <method selector='getComputedStyle::'>
-      <arg name='getComputedStyle' declared_type='DOMElement*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMCSSStyleDeclaration*' type='@'/>
-    </method>
-    <method selector='getComputedStyle:pseudoElement:'>
-      <arg name='element' declared_type='DOMElement*' type='@' index='0'/>
-      <arg name='pseudoElement' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMCSSStyleDeclaration*' type='@'/>
-    </method>
-    <method selector='getElementById:'>
-      <arg name='elementId' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMElement*' type='@'/>
-    </method>
-    <method selector='getElementsByTagName:'>
-      <arg name='tagname' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMNodeList*' type='@'/>
-    </method>
-    <method selector='getElementsByTagNameNS::'>
-      <arg name='getElementsByTagNameNS' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMNodeList*' type='@'/>
-    </method>
-    <method selector='getElementsByTagNameNS:localName:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <arg name='localName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMNodeList*' type='@'/>
-    </method>
-    <method selector='getMatchedCSSRules:pseudoElement:'>
-      <arg name='element' declared_type='DOMElement*' type='@' index='0'/>
-      <arg name='pseudoElement' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMCSSRuleList*' type='@'/>
-    </method>
-    <method selector='getMatchedCSSRules:pseudoElement:authorOnly:'>
-      <arg name='element' declared_type='DOMElement*' type='@' index='0'/>
-      <arg name='pseudoElement' declared_type='NSString*' type='@' index='1'/>
-      <arg name='authorOnly' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='DOMCSSRuleList*' type='@'/>
-    </method>
-    <method selector='getOverrideStyle::'>
-      <arg name='getOverrideStyle' declared_type='DOMElement*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMCSSStyleDeclaration*' type='@'/>
-    </method>
-    <method selector='getOverrideStyle:pseudoElement:'>
-      <arg name='element' declared_type='DOMElement*' type='@' index='0'/>
-      <arg name='pseudoElement' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMCSSStyleDeclaration*' type='@'/>
-    </method>
-    <method selector='importNode::'>
-      <arg name='importNode' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='importNode:deep:'>
-      <arg name='importedNode' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='deep' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='webFrame'>
-      <retval declared_type='WebFrame*' type='@'/>
-    </method>
-  </class>
-  <class name='DOMElement'>
-    <method selector='blur'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='clientHeight'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='clientWidth'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='focus'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='getAttribute:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='getAttributeNS::'>
-      <arg name='getAttributeNS' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='getAttributeNS:localName:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <arg name='localName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='getAttributeNode:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMAttr*' type='@'/>
-    </method>
-    <method selector='getAttributeNodeNS::'>
-      <arg name='getAttributeNodeNS' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMAttr*' type='@'/>
-    </method>
-    <method selector='getAttributeNodeNS:localName:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <arg name='localName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMAttr*' type='@'/>
-    </method>
-    <method selector='getElementsByTagName:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMNodeList*' type='@'/>
-    </method>
-    <method selector='getElementsByTagNameNS::'>
-      <arg name='getElementsByTagNameNS' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMNodeList*' type='@'/>
-    </method>
-    <method selector='getElementsByTagNameNS:localName:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <arg name='localName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMNodeList*' type='@'/>
-    </method>
-    <method selector='hasAttribute:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasAttributeNS::'>
-      <arg name='hasAttributeNS' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasAttributeNS:localName:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <arg name='localName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='image'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='offsetHeight'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='offsetLeft'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='offsetTop'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='offsetWidth'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='removeAttribute:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAttributeNS::'>
-      <arg name='removeAttributeNS' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAttributeNS:localName:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <arg name='localName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeAttributeNode:'>
-      <arg name='oldAttr' declared_type='DOMAttr*' type='@' index='0'/>
-      <retval declared_type='DOMAttr*' type='@'/>
-    </method>
-    <method selector='scrollHeight'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='scrollIntoView:'>
-      <arg name='alignWithTop' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollIntoViewIfNeeded:'>
-      <arg name='centerIfNeeded' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='scrollLeft'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='scrollTop'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='scrollWidth'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='setAttribute::'>
-      <arg name='setAttribute' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttribute:value:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='value' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributeNS:::'>
-      <arg name='setAttributeNS' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <arg name='' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributeNS:qualifiedName:value:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <arg name='qualifiedName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='value' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAttributeNode:'>
-      <arg name='newAttr' declared_type='DOMAttr*' type='@' index='0'/>
-      <retval declared_type='DOMAttr*' type='@'/>
-    </method>
-    <method selector='setAttributeNodeNS:'>
-      <arg name='newAttr' declared_type='DOMAttr*' type='@' index='0'/>
-      <retval declared_type='DOMAttr*' type='@'/>
-    </method>
-    <method selector='setScrollLeft:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setScrollTop:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMEvent'>
-    <method selector='bubbles'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cancelable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='currentTarget'>
-      <retval declared_type='id &lt;DOMEventTarget&gt;' type='@'/>
-    </method>
-    <method selector='eventPhase'>
-      <retval declared_type='unsigned short' type='S'/>
-    </method>
-    <method selector='initEvent:::'>
-      <arg name='initEvent' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='BOOL' type='B' index='1'/>
-      <arg name='' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initEvent:canBubbleArg:cancelableArg:'>
-      <arg name='eventTypeArg' declared_type='NSString*' type='@' index='0'/>
-      <arg name='canBubbleArg' declared_type='BOOL' type='B' index='1'/>
-      <arg name='cancelableArg' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='preventDefault'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopPropagation'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='target'>
-      <retval declared_type='id &lt;DOMEventTarget&gt;' type='@'/>
-    </method>
-    <method selector='timeStamp'>
-      <retval declared_type='DOMTimeStamp' type='Q'/>
-    </method>
-  </class>
-  <class name='DOMHTMLAnchorElement'>
-    <method selector='blur'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='focus'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTabIndex:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tabIndex'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLAppletElement'>
-    <method selector='hspace'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='setHspace:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVspace:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='vspace'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLAreaElement'>
-    <method selector='noHref'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setNoHref:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTabIndex:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tabIndex'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLButtonElement'>
-    <method selector='disabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setDisabled:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTabIndex:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tabIndex'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLCollection'>
-    <method selector='item:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-    <method selector='namedItem:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-  </class>
-  <class name='DOMHTMLDListElement'>
-    <method selector='compact'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setCompact:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLDirectoryElement'>
-    <method selector='compact'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setCompact:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLDocument'>
-    <method selector='close'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='createDocumentFragmentWithMarkupString:baseURL:'>
-      <arg name='markupString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='baseURL' declared_type='NSURL*' type='@' index='1'/>
-      <retval declared_type='DOMDocumentFragment*' type='@'/>
-    </method>
-    <method selector='createDocumentFragmentWithText:'>
-      <arg name='text' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMDocumentFragment*' type='@'/>
-    </method>
-    <method selector='getElementById:'>
-      <arg name='elementId' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMElement*' type='@'/>
-    </method>
-    <method selector='getElementsByName:'>
-      <arg name='elementName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMNodeList*' type='@'/>
-    </method>
-    <method selector='open'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='write:'>
-      <arg name='text' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='writeln:'>
-      <arg name='text' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLElement'>
-    <method selector='isContentEditable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='DOMHTMLEmbedElement'>
-    <method selector='height'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='setHeight:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWidth:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='width'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLFormElement'>
-    <method selector='length'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='reset'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='submit'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLFrameElement'>
-    <method selector='contentFrame'>
-      <retval declared_type='WebFrame*' type='@'/>
-    </method>
-    <method selector='noResize'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setNoResize:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLHRElement'>
-    <method selector='noShade'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setNoShade:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLIFrameElement'>
-    <method selector='contentFrame'>
-      <retval declared_type='WebFrame*' type='@'/>
-    </method>
-  </class>
-  <class name='DOMHTMLImageElement'>
-    <method selector='height'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='hspace'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='isMap'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setHeight:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHspace:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setIsMap:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVspace:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWidth:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='vspace'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='width'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLInputElement'>
-    <method selector='blur'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='checked'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='click'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='defaultChecked'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='disabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='focus'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='maxLength'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='readOnly'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='select'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setChecked:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDefaultChecked:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDisabled:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaxLength:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setReadOnly:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTabIndex:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tabIndex'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLLIElement'>
-    <method selector='setValue:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='value'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLLinkElement'>
-    <method selector='disabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setDisabled:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLMarqueeElement'>
-    <method selector='start'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stop'>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLMenuElement'>
-    <method selector='compact'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setCompact:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLOListElement'>
-    <method selector='compact'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setCompact:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStart:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='start'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLObjectElement'>
-    <method selector='contentFrame'>
-      <retval declared_type='WebFrame*' type='@'/>
-    </method>
-    <method selector='declare'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hspace'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='setDeclare:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHspace:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTabIndex:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setVspace:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tabIndex'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='vspace'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLOptGroupElement'>
-    <method selector='disabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setDisabled:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLOptionElement'>
-    <method selector='defaultSelected'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='disabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='index'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='selected'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setDefaultSelected:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDisabled:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelected:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLOptionsCollection'>
-    <method selector='item:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-    <method selector='namedItem:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='setLength:'>
-      <arg name='' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLPreElement'>
-    <method selector='setWidth:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='width'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLScriptElement'>
-    <method selector='defer'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setDefer:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLSelectElement'>
-    <method selector='add::'>
-      <arg name='add' declared_type='DOMHTMLElement*' type='@' index='0'/>
-      <arg name='' declared_type='DOMHTMLElement*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='add:before:'>
-      <arg name='element' declared_type='DOMHTMLElement*' type='@' index='0'/>
-      <arg name='before' declared_type='DOMHTMLElement*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='blur'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='disabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='focus'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='multiple'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='remove:'>
-      <arg name='index' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedIndex'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='setDisabled:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMultiple:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedIndex:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSize:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTabIndex:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='size'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='tabIndex'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLStyleElement'>
-    <method selector='disabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setDisabled:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLTableCellElement'>
-    <method selector='cellIndex'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='colSpan'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='noWrap'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rowSpan'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='setColSpan:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNoWrap:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRowSpan:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMHTMLTableColElement'>
-    <method selector='setSpan:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='span'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLTableElement'>
-    <method selector='createCaption'>
-      <retval declared_type='DOMHTMLElement*' type='@'/>
-    </method>
-    <method selector='createTFoot'>
-      <retval declared_type='DOMHTMLElement*' type='@'/>
-    </method>
-    <method selector='createTHead'>
-      <retval declared_type='DOMHTMLElement*' type='@'/>
-    </method>
-    <method selector='deleteCaption'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteRow:'>
-      <arg name='index' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteTFoot'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteTHead'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertRow:'>
-      <arg name='index' declared_type='int' type='i' index='0'/>
-      <retval declared_type='DOMHTMLElement*' type='@'/>
-    </method>
-  </class>
-  <class name='DOMHTMLTableRowElement'>
-    <method selector='deleteCell:'>
-      <arg name='index' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertCell:'>
-      <arg name='index' declared_type='int' type='i' index='0'/>
-      <retval declared_type='DOMHTMLElement*' type='@'/>
-    </method>
-    <method selector='rowIndex'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='sectionRowIndex'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLTableSectionElement'>
-    <method selector='deleteRow:'>
-      <arg name='index' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='insertRow:'>
-      <arg name='index' declared_type='int' type='i' index='0'/>
-      <retval declared_type='DOMHTMLElement*' type='@'/>
-    </method>
-  </class>
-  <class name='DOMHTMLTextAreaElement'>
-    <method selector='blur'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='cols'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='disabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='focus'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='readOnly'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='rows'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='select'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCols:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDisabled:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setReadOnly:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setRows:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTabIndex:'>
-      <arg name='' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='tabIndex'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMHTMLUListElement'>
-    <method selector='compact'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setCompact:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMImplementation'>
-    <method selector='createCSSStyleSheet::'>
-      <arg name='createCSSStyleSheet' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMCSSStyleSheet*' type='@'/>
-    </method>
-    <method selector='createCSSStyleSheet:media:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <arg name='media' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMCSSStyleSheet*' type='@'/>
-    </method>
-    <method selector='createDocument:::'>
-      <arg name='createDocument' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <arg name='' declared_type='DOMDocumentType*' type='@' index='2'/>
-      <retval declared_type='DOMDocument*' type='@'/>
-    </method>
-    <method selector='createDocument:qualifiedName:doctype:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <arg name='qualifiedName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='doctype' declared_type='DOMDocumentType*' type='@' index='2'/>
-      <retval declared_type='DOMDocument*' type='@'/>
-    </method>
-    <method selector='createDocumentType:::'>
-      <arg name='createDocumentType' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <arg name='' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='DOMDocumentType*' type='@'/>
-    </method>
-    <method selector='createDocumentType:publicId:systemId:'>
-      <arg name='qualifiedName' declared_type='NSString*' type='@' index='0'/>
-      <arg name='publicId' declared_type='NSString*' type='@' index='1'/>
-      <arg name='systemId' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='DOMDocumentType*' type='@'/>
-    </method>
-    <method selector='createHTMLDocument:'>
-      <arg name='title' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMHTMLDocument*' type='@'/>
-    </method>
-    <method selector='hasFeature::'>
-      <arg name='hasFeature' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasFeature:version:'>
-      <arg name='feature' declared_type='NSString*' type='@' index='0'/>
-      <arg name='version' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='DOMKeyboardEvent'>
-    <method selector='altKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='charCode'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='ctrlKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='getModifierState:'>
-      <arg name='keyIdentifierArg' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='keyCode'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='keyLocation'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-    <method selector='metaKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='shiftKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='DOMMediaList'>
-    <method selector='appendMedium:'>
-      <arg name='newMedium' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteMedium:'>
-      <arg name='oldMedium' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='item:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-  </class>
-  <class name='DOMMouseEvent'>
-    <method selector='altKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='button'>
-      <retval declared_type='unsigned short' type='S'/>
-    </method>
-    <method selector='clientX'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='clientY'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='ctrlKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initMouseEvent:::::::::::::::'>
-      <arg name='initMouseEvent' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='BOOL' type='B' index='1'/>
-      <arg name='' declared_type='BOOL' type='B' index='2'/>
-      <arg name='' declared_type='DOMAbstractView*' type='@' index='3'/>
-      <arg name='' declared_type='int' type='i' index='4'/>
-      <arg name='' declared_type='int' type='i' index='5'/>
-      <arg name='' declared_type='int' type='i' index='6'/>
-      <arg name='' declared_type='int' type='i' index='7'/>
-      <arg name='' declared_type='int' type='i' index='8'/>
-      <arg name='' declared_type='BOOL' type='B' index='9'/>
-      <arg name='' declared_type='BOOL' type='B' index='10'/>
-      <arg name='' declared_type='BOOL' type='B' index='11'/>
-      <arg name='' declared_type='BOOL' type='B' index='12'/>
-      <arg name='' declared_type='unsigned short' type='S' index='13'/>
-      <arg name='' declared_type='id &lt;DOMEventTarget&gt;' type='@' index='14'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initMouseEvent:canBubble:cancelable:view:detail:screenX:screenY:clientX:clientY:ctrlKey:altKey:shiftKey:metaKey:button:relatedTarget:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <arg name='canBubble' declared_type='BOOL' type='B' index='1'/>
-      <arg name='cancelable' declared_type='BOOL' type='B' index='2'/>
-      <arg name='view' declared_type='DOMAbstractView*' type='@' index='3'/>
-      <arg name='detail' declared_type='int' type='i' index='4'/>
-      <arg name='screenX' declared_type='int' type='i' index='5'/>
-      <arg name='screenY' declared_type='int' type='i' index='6'/>
-      <arg name='clientX' declared_type='int' type='i' index='7'/>
-      <arg name='clientY' declared_type='int' type='i' index='8'/>
-      <arg name='ctrlKey' declared_type='BOOL' type='B' index='9'/>
-      <arg name='altKey' declared_type='BOOL' type='B' index='10'/>
-      <arg name='shiftKey' declared_type='BOOL' type='B' index='11'/>
-      <arg name='metaKey' declared_type='BOOL' type='B' index='12'/>
-      <arg name='button' declared_type='unsigned short' type='S' index='13'/>
-      <arg name='relatedTarget' declared_type='id &lt;DOMEventTarget&gt;' type='@' index='14'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='metaKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='relatedTarget'>
-      <retval declared_type='id &lt;DOMEventTarget&gt;' type='@'/>
-    </method>
-    <method selector='screenX'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='screenY'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='shiftKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='DOMMutationEvent'>
-    <method selector='attrChange'>
-      <retval declared_type='unsigned short' type='S'/>
-    </method>
-    <method selector='initMutationEvent::::::::'>
-      <arg name='initMutationEvent' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='BOOL' type='B' index='1'/>
-      <arg name='' declared_type='BOOL' type='B' index='2'/>
-      <arg name='' declared_type='DOMNode*' type='@' index='3'/>
-      <arg name='' declared_type='NSString*' type='@' index='4'/>
-      <arg name='' declared_type='NSString*' type='@' index='5'/>
-      <arg name='' declared_type='NSString*' type='@' index='6'/>
-      <arg name='' declared_type='unsigned short' type='S' index='7'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initMutationEvent:canBubble:cancelable:relatedNode:prevValue:newValue:attrName:attrChange:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <arg name='canBubble' declared_type='BOOL' type='B' index='1'/>
-      <arg name='cancelable' declared_type='BOOL' type='B' index='2'/>
-      <arg name='relatedNode' declared_type='DOMNode*' type='@' index='3'/>
-      <arg name='prevValue' declared_type='NSString*' type='@' index='4'/>
-      <arg name='newValue' declared_type='NSString*' type='@' index='5'/>
-      <arg name='attrName' declared_type='NSString*' type='@' index='6'/>
-      <arg name='attrChange' declared_type='unsigned short' type='S' index='7'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMNamedNodeMap'>
-    <method selector='getNamedItem:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='getNamedItemNS::'>
-      <arg name='getNamedItemNS' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='getNamedItemNS:localName:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <arg name='localName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='item:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-    <method selector='removeNamedItem:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='removeNamedItemNS::'>
-      <arg name='removeNamedItemNS' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='removeNamedItemNS:localName:'>
-      <arg name='namespaceURI' declared_type='NSString*' type='@' index='0'/>
-      <arg name='localName' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='setNamedItem:'>
-      <arg name='node' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='setNamedItemNS:'>
-      <arg name='node' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-  </class>
-  <class name='DOMNode'>
-    <method selector='appendChild:'>
-      <arg name='newChild' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='boundingBox'>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='cloneNode:'>
-      <arg name='deep' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='hasAttributes'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='hasChildNodes'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='insertBefore::'>
-      <arg name='insertBefore' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='' declared_type='DOMNode*' type='@' index='1'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='insertBefore:refChild:'>
-      <arg name='newChild' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='refChild' declared_type='DOMNode*' type='@' index='1'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='isEqualNode:'>
-      <arg name='other' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSameNode:'>
-      <arg name='other' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSupported::'>
-      <arg name='isSupported' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isSupported:version:'>
-      <arg name='feature' declared_type='NSString*' type='@' index='0'/>
-      <arg name='version' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='lineBoxRects'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='nodeType'>
-      <retval declared_type='unsigned short' type='S'/>
-    </method>
-    <method selector='normalize'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeChild:'>
-      <arg name='oldChild' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='replaceChild::'>
-      <arg name='replaceChild' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='' declared_type='DOMNode*' type='@' index='1'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='replaceChild:oldChild:'>
-      <arg name='newChild' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='oldChild' declared_type='DOMNode*' type='@' index='1'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='webArchive'>
-      <retval declared_type='WebArchive*' type='@'/>
-    </method>
-  </class>
-  <class name='DOMNodeIterator'>
-    <method selector='detach'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='expandEntityReferences'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='filter'>
-      <retval declared_type='id &lt;DOMNodeFilter&gt;' type='@'/>
-    </method>
-    <method selector='nextNode'>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='previousNode'>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='whatToShow'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-  </class>
-  <class name='DOMNodeList'>
-    <method selector='item:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-  </class>
-  <class name='DOMOverflowEvent'>
-    <method selector='horizontalOverflow'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='initOverflowEvent:horizontalOverflow:verticalOverflow:'>
-      <arg name='orient' declared_type='unsigned short' type='S' index='0'/>
-      <arg name='horizontalOverflow' declared_type='BOOL' type='B' index='1'/>
-      <arg name='verticalOverflow' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='orient'>
-      <retval declared_type='unsigned short' type='S'/>
-    </method>
-    <method selector='verticalOverflow'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='DOMRange'>
-    <method selector='cloneContents'>
-      <retval declared_type='DOMDocumentFragment*' type='@'/>
-    </method>
-    <method selector='cloneRange'>
-      <retval declared_type='DOMRange*' type='@'/>
-    </method>
-    <method selector='collapse:'>
-      <arg name='toStart' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='collapsed'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='compareBoundaryPoints::'>
-      <arg name='compareBoundaryPoints' declared_type='unsigned short' type='S' index='0'/>
-      <arg name='' declared_type='DOMRange*' type='@' index='1'/>
-      <retval declared_type='short' type='s'/>
-    </method>
-    <method selector='compareBoundaryPoints:sourceRange:'>
-      <arg name='how' declared_type='unsigned short' type='S' index='0'/>
-      <arg name='sourceRange' declared_type='DOMRange*' type='@' index='1'/>
-      <retval declared_type='short' type='s'/>
-    </method>
-    <method selector='deleteContents'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='detach'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='endOffset'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='extractContents'>
-      <retval declared_type='DOMDocumentFragment*' type='@'/>
-    </method>
-    <method selector='insertNode:'>
-      <arg name='newNode' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='markupString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='selectNode:'>
-      <arg name='refNode' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectNodeContents:'>
-      <arg name='refNode' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEnd::'>
-      <arg name='setEnd' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='' declared_type='int' type='i' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEnd:offset:'>
-      <arg name='refNode' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='offset' declared_type='int' type='i' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEndAfter:'>
-      <arg name='refNode' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEndBefore:'>
-      <arg name='refNode' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStart::'>
-      <arg name='setStart' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='' declared_type='int' type='i' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStart:offset:'>
-      <arg name='refNode' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='offset' declared_type='int' type='i' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStartAfter:'>
-      <arg name='refNode' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStartBefore:'>
-      <arg name='refNode' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='startOffset'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='surroundContents:'>
-      <arg name='newParent' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='webArchive'>
-      <retval declared_type='WebArchive*' type='@'/>
-    </method>
-  </class>
-  <class name='DOMStyleSheet'>
-    <method selector='disabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setDisabled:'>
-      <arg name='' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMStyleSheetList'>
-    <method selector='item:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='DOMStyleSheet*' type='@'/>
-    </method>
-    <method selector='length'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-  </class>
-  <class name='DOMText'>
-    <method selector='splitText:'>
-      <arg name='offset' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='DOMText*' type='@'/>
-    </method>
-  </class>
-  <class name='DOMTreeWalker'>
-    <method selector='expandEntityReferences'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='filter'>
-      <retval declared_type='id &lt;DOMNodeFilter&gt;' type='@'/>
-    </method>
-    <method selector='firstChild'>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='lastChild'>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='nextNode'>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='nextSibling'>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='parentNode'>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='previousNode'>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='previousSibling'>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='whatToShow'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-  </class>
-  <class name='DOMUIEvent'>
-    <method selector='detail'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='initUIEvent:::::'>
-      <arg name='initUIEvent' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='BOOL' type='B' index='1'/>
-      <arg name='' declared_type='BOOL' type='B' index='2'/>
-      <arg name='' declared_type='DOMAbstractView*' type='@' index='3'/>
-      <arg name='' declared_type='int' type='i' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='initUIEvent:canBubble:cancelable:view:detail:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <arg name='canBubble' declared_type='BOOL' type='B' index='1'/>
-      <arg name='cancelable' declared_type='BOOL' type='B' index='2'/>
-      <arg name='view' declared_type='DOMAbstractView*' type='@' index='3'/>
-      <arg name='detail' declared_type='int' type='i' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='DOMWheelEvent'>
-    <method selector='altKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='clientX'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='clientY'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='ctrlKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isHorizontal'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='metaKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='screenX'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='screenY'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='shiftKey'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='wheelDelta'>
-      <retval declared_type='int' type='i'/>
-    </method>
-  </class>
-  <class name='DOMXPathExpression'>
-    <method selector='evaluate:::'>
-      <arg name='evaluate' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='' declared_type='unsigned short' type='S' index='1'/>
-      <arg name='' declared_type='DOMXPathResult*' type='@' index='2'/>
-      <retval declared_type='DOMXPathResult*' type='@'/>
-    </method>
-    <method selector='evaluate:type:inResult:'>
-      <arg name='contextNode' declared_type='DOMNode*' type='@' index='0'/>
-      <arg name='type' declared_type='unsigned short' type='S' index='1'/>
-      <arg name='inResult' declared_type='DOMXPathResult*' type='@' index='2'/>
-      <retval declared_type='DOMXPathResult*' type='@'/>
-    </method>
-  </class>
-  <class name='DOMXPathResult'>
-    <method selector='booleanValue'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='invalidIteratorState'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='iterateNext'>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='numberValue'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='resultType'>
-      <retval declared_type='unsigned short' type='S'/>
-    </method>
-    <method selector='snapshotItem:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='DOMNode*' type='@'/>
-    </method>
-    <method selector='snapshotLength'>
-      <retval declared_type='unsigned' type='I'/>
-    </method>
-  </class>
-  <class name='NSObject'>
-    <method selector='acceptNode:'>
-      <arg name='n' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='short' type='s'/>
-    </method>
-    <method selector='addEventListener:::'>
-      <arg name='addEventListener' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='id &lt;DOMEventListener&gt;' type='@' index='1'/>
-      <arg name='' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='addEventListener:listener:useCapture:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <arg name='listener' declared_type='id &lt;DOMEventListener&gt;' type='@' index='1'/>
-      <arg name='useCapture' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='attributedString'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='canProvideDocumentSource'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cancel'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='chooseFilename:'>
-      <arg name='fileName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='dataSourceUpdated:'>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deselectAll'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='dispatchEvent:'>
-      <arg name='event' declared_type='DOMEvent*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='documentSource'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='download'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='downloadWindowForAuthenticationSheet:'>
-      <arg name='download' declared_type='WebDownload*' type='@' index='0'/>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='finalizeForWebScript'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='finishedLoadingWithDataSource:'>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='handleEvent:'>
-      <arg name='evt' declared_type='DOMEvent*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='ignore'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='invokeDefaultMethodWithArguments:'>
-      <arg name='args' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='invokeUndefinedMethodFromWebScript:withArguments:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='args' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='isKeyExcludedFromWebScript:'>
-      <arg name='name' declared_type='char*' type='*' const='true' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='isSelectorExcludedFromWebScript:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='layout'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='lookupNamespaceURI:'>
-      <arg name='prefix' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='objectForWebScript'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='plugInViewWithArguments:'>
-      <arg name='arguments' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='NSView*' type='@'/>
-    </method>
-    <method selector='receivedData:withDataSource:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='receivedError:withDataSource:'>
-      <arg name='error' declared_type='NSError*' type='@' index='0'/>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeEventListener:::'>
-      <arg name='removeEventListener' declared_type='NSString*' type='@' index='0'/>
-      <arg name='' declared_type='id &lt;DOMEventListener&gt;' type='@' index='1'/>
-      <arg name='' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeEventListener:listener:useCapture:'>
-      <arg name='type' declared_type='NSString*' type='@' index='0'/>
-      <arg name='listener' declared_type='id &lt;DOMEventListener&gt;' type='@' index='1'/>
-      <arg name='useCapture' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='searchFor:direction:caseSensitive:wrap:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='forward' declared_type='BOOL' type='B' index='1'/>
-      <arg name='caseFlag' declared_type='BOOL' type='B' index='2'/>
-      <arg name='wrapFlag' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectAll'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedAttributedString'>
-      <retval declared_type='NSAttributedString*' type='@'/>
-    </method>
-    <method selector='selectedString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setDataSource:'>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDataSource:'>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setNeedsLayout:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='string'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='supportsTextEncoding'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='undoManagerForWebView:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='NSUndoManager*' type='@'/>
-    </method>
-    <method selector='use'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewDidMoveToHostWindow'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='viewWillMoveToHostWindow:'>
-      <arg name='hostWindow' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webFrame'>
-      <retval declared_type='WebFrame*' type='@'/>
-    </method>
-    <method selector='webPlugInCallJava:isStatic:returnType:method:arguments:callingURL:exceptionDescription:'>
-      <arg name='object' declared_type='jobject' type='^{_jobject=}' index='0'/>
-      <arg name='isStatic' declared_type='BOOL' type='B' index='1'/>
-      <arg name='returnType' declared_type='WebJNIReturnType' type='i' index='2'/>
-      <arg name='method' declared_type='jmethodID' type='^{_jmethodID=}' index='3'/>
-      <arg name='args' declared_type='jvalue*' type='^(jvalue=CcSsiqfd^{_jobject})' index='4'/>
-      <arg name='url' declared_type='NSURL*' type='@' index='5'/>
-      <arg name='exceptionString' declared_type='NSString**' type='^@' index='6'/>
-      <retval declared_type='jvalue' type='(jvalue=CcSsiqfd^{_jobject})'/>
-    </method>
-    <method selector='webPlugInContainerLoadRequest:inFrame:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <arg name='target' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webPlugInContainerSelectionColor'>
-      <retval declared_type='NSColor*' type='@'/>
-    </method>
-    <method selector='webPlugInContainerShowStatus:'>
-      <arg name='message' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webPlugInDestroy'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webPlugInGetApplet'>
-      <retval declared_type='jobject' type='^{_jobject=}'/>
-    </method>
-    <method selector='webPlugInInitialize'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webPlugInSetIsSelected:'>
-      <arg name='isSelected' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webPlugInStart'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webPlugInStop'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='webScriptNameForKey:'>
-      <arg name='name' declared_type='char*' type='*' const='true' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='webScriptNameForSelector:'>
-      <arg name='aSelector' declared_type='SEL' type=':' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='webView:contextMenuItemsForElement:defaultMenuItems:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='element' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='defaultMenuItems' declared_type='NSArray*' type='@' index='2'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='webView:createWebViewModalDialogWithRequest:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='1'/>
-      <retval declared_type='WebView*' type='@'/>
-    </method>
-    <method selector='webView:createWebViewWithRequest:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='1'/>
-      <retval declared_type='WebView*' type='@'/>
-    </method>
-    <method selector='webView:decidePolicyForMIMEType:request:frame:decisionListener:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='type' declared_type='NSString*' type='@' index='1'/>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='2'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='3'/>
-      <arg name='listener' declared_type='id&lt;WebPolicyDecisionListener&gt;' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:decidePolicyForNavigationAction:request:frame:decisionListener:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='actionInformation' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='2'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='3'/>
-      <arg name='listener' declared_type='id&lt;WebPolicyDecisionListener&gt;' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='actionInformation' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='2'/>
-      <arg name='frameName' declared_type='NSString*' type='@' index='3'/>
-      <arg name='listener' declared_type='id&lt;WebPolicyDecisionListener&gt;' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:didCancelClientRedirectForFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:didChangeLocationWithinPageForFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:didClearWindowObject:forFrame:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='windowObject' declared_type='WebScriptObject*' type='@' index='1'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:didCommitLoadForFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:didFailLoadWithError:forFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError*' type='@' index='1'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:didFailProvisionalLoadWithError:forFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError*' type='@' index='1'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:didFinishLoadForFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:didReceiveIcon:forFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='image' declared_type='NSImage*' type='@' index='1'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:didReceiveServerRedirectForProvisionalLoadForFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:didReceiveTitle:forFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='title' declared_type='NSString*' type='@' index='1'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:didStartProvisionalLoadForFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:doCommandBySelector:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='selector' declared_type='SEL' type=':' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:dragDestinationActionMaskForDraggingInfo:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='draggingInfo' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='1'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='webView:dragSourceActionMaskForPoint:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='1'/>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='webView:drawFooterInRect:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:drawHeaderInRect:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='rect' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:identifierForInitialRequest:fromDataSource:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='1'/>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='webView:makeFirstResponder:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='responder' declared_type='NSResponder*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:mouseDidMoveOverElement:modifierFlags:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='elementInformation' declared_type='NSDictionary*' type='@' index='1'/>
-      <arg name='modifierFlags' declared_type='NSUInteger' type='I' type64='Q' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:plugInFailedWithError:dataSource:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError*' type='@' index='1'/>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:printFrameView:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='frameView' declared_type='WebFrameView*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:resource:didCancelAuthenticationChallenge:fromDataSource:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='identifier' declared_type='id' type='@' index='1'/>
-      <arg name='challenge' declared_type='NSURLAuthenticationChallenge*' type='@' index='2'/>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:resource:didFailLoadingWithError:fromDataSource:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='identifier' declared_type='id' type='@' index='1'/>
-      <arg name='error' declared_type='NSError*' type='@' index='2'/>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:resource:didFinishLoadingFromDataSource:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='identifier' declared_type='id' type='@' index='1'/>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:resource:didReceiveAuthenticationChallenge:fromDataSource:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='identifier' declared_type='id' type='@' index='1'/>
-      <arg name='challenge' declared_type='NSURLAuthenticationChallenge*' type='@' index='2'/>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:resource:didReceiveContentLength:fromDataSource:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='identifier' declared_type='id' type='@' index='1'/>
-      <arg name='length' declared_type='NSInteger' type='i' type64='q' index='2'/>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:resource:didReceiveResponse:fromDataSource:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='identifier' declared_type='id' type='@' index='1'/>
-      <arg name='response' declared_type='NSURLResponse*' type='@' index='2'/>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:resource:willSendRequest:redirectResponse:fromDataSource:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='identifier' declared_type='id' type='@' index='1'/>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='2'/>
-      <arg name='redirectResponse' declared_type='NSURLResponse*' type='@' index='3'/>
-      <arg name='dataSource' declared_type='WebDataSource*' type='@' index='4'/>
-      <retval declared_type='NSURLRequest*' type='@'/>
-    </method>
-    <method selector='webView:runBeforeUnloadConfirmPanelWithMessage:initiatedByFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='message' declared_type='NSString*' type='@' index='1'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:runJavaScriptAlertPanelWithMessage:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='message' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='message' declared_type='NSString*' type='@' index='1'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:runJavaScriptConfirmPanelWithMessage:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='message' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='message' declared_type='NSString*' type='@' index='1'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:runJavaScriptTextInputPanelWithPrompt:defaultText:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='prompt' declared_type='NSString*' type='@' index='1'/>
-      <arg name='defaultText' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='prompt' declared_type='NSString*' type='@' index='1'/>
-      <arg name='defaultText' declared_type='NSString*' type='@' index='2'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='3'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='webView:runOpenPanelForFileButtonWithResultListener:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='resultListener' declared_type='id&lt;WebOpenPanelResultListener&gt;' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:setContentRect:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:setFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:setResizable:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='resizable' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:setStatusBarVisible:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='visible' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:setStatusText:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='text' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:setToolbarsVisible:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='visible' declared_type='BOOL' type='B' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:shouldApplyStyle:toElementsInDOMRange:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='style' declared_type='DOMCSSStyleDeclaration*' type='@' index='1'/>
-      <arg name='range' declared_type='DOMRange*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:shouldBeginEditingInDOMRange:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='range' declared_type='DOMRange*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:shouldChangeSelectedDOMRange:toDOMRange:affinity:stillSelecting:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='currentRange' declared_type='DOMRange*' type='@' index='1'/>
-      <arg name='proposedRange' declared_type='DOMRange*' type='@' index='2'/>
-      <arg name='selectionAffinity' declared_type='NSSelectionAffinity' type='I' type64='Q' index='3'/>
-      <arg name='flag' declared_type='BOOL' type='B' index='4'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:shouldChangeTypingStyle:toStyle:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='currentStyle' declared_type='DOMCSSStyleDeclaration*' type='@' index='1'/>
-      <arg name='proposedStyle' declared_type='DOMCSSStyleDeclaration*' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:shouldDeleteDOMRange:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='range' declared_type='DOMRange*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:shouldEndEditingInDOMRange:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='range' declared_type='DOMRange*' type='@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:shouldInsertNode:replacingDOMRange:givenAction:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='node' declared_type='DOMNode*' type='@' index='1'/>
-      <arg name='range' declared_type='DOMRange*' type='@' index='2'/>
-      <arg name='action' declared_type='WebViewInsertAction' type='i' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:shouldInsertText:replacingDOMRange:givenAction:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='text' declared_type='NSString*' type='@' index='1'/>
-      <arg name='range' declared_type='DOMRange*' type='@' index='2'/>
-      <arg name='action' declared_type='WebViewInsertAction' type='i' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:shouldPerformAction:fromSender:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='action' declared_type='SEL' type=':' index='1'/>
-      <arg name='sender' declared_type='id' type='@' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:unableToImplementPolicyWithError:frame:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError*' type='@' index='1'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:validateUserInterfaceItem:defaultValidation:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='item' declared_type='id &lt;NSValidatedUserInterfaceItem&gt;' type='@' index='1'/>
-      <arg name='defaultValidation' declared_type='BOOL' type='B' index='2'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webView:willCloseFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:willPerformClientRedirectToURL:delay:fireDate:forFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <arg name='URL' declared_type='NSURL*' type='@' index='1'/>
-      <arg name='seconds' declared_type='NSTimeInterval' type='d' index='2'/>
-      <arg name='date' declared_type='NSDate*' type='@' index='3'/>
-      <arg name='frame' declared_type='WebFrame*' type='@' index='4'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:willPerformDragDestinationAction:forDraggingInfo:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='action' declared_type='WebDragDestinationAction' type='i' index='1'/>
-      <arg name='draggingInfo' declared_type='id &lt;NSDraggingInfo&gt;' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:willPerformDragSourceAction:fromPoint:withPasteboard:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='action' declared_type='WebDragSourceAction' type='i' index='1'/>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='2'/>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView:windowScriptObjectAvailable:'>
-      <arg name='webView' declared_type='WebView*' type='@' index='0'/>
-      <arg name='windowScriptObject' declared_type='WebScriptObject*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webViewAreToolbarsVisible:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webViewClose:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webViewContentRect:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='webViewDidBeginEditing:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webViewDidChange:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webViewDidChangeSelection:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webViewDidChangeTypingStyle:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webViewDidEndEditing:'>
-      <arg name='notification' declared_type='NSNotification*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webViewFirstResponder:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='NSResponder*' type='@'/>
-    </method>
-    <method selector='webViewFocus:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webViewFooterHeight:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='webViewFrame:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}'/>
-    </method>
-    <method selector='webViewHeaderHeight:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='webViewIsResizable:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webViewIsStatusBarVisible:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webViewRunModal:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webViewShow:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webViewStatusText:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='webViewUnfocus:'>
-      <arg name='sender' declared_type='WebView*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='WebArchive'>
-    <method selector='data'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='initWithData:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initWithMainResource:subresources:subframeArchives:'>
-      <arg name='mainResource' declared_type='WebResource*' type='@' index='0'/>
-      <arg name='subresources' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='subframeArchives' declared_type='NSArray*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='mainResource'>
-      <retval declared_type='WebResource*' type='@'/>
-    </method>
-    <method selector='subframeArchives'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='subresources'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-  </class>
-  <class name='WebBackForwardList'>
-    <method selector='addItem:'>
-      <arg name='item' declared_type='WebHistoryItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='backItem'>
-      <retval declared_type='WebHistoryItem*' type='@'/>
-    </method>
-    <method selector='backListCount'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='backListWithLimit:'>
-      <arg name='limit' declared_type='int' type='i' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='capacity'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='containsItem:'>
-      <arg name='item' declared_type='WebHistoryItem*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='currentItem'>
-      <retval declared_type='WebHistoryItem*' type='@'/>
-    </method>
-    <method selector='forwardItem'>
-      <retval declared_type='WebHistoryItem*' type='@'/>
-    </method>
-    <method selector='forwardListCount'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='forwardListWithLimit:'>
-      <arg name='limit' declared_type='int' type='i' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='goBack'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='goForward'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='goToItem:'>
-      <arg name='item' declared_type='WebHistoryItem*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='itemAtIndex:'>
-      <arg name='index' declared_type='int' type='i' index='0'/>
-      <retval declared_type='WebHistoryItem*' type='@'/>
-    </method>
-    <method selector='pageCacheSize'>
-      <retval declared_type='NSUInteger' type='I' type64='Q'/>
-    </method>
-    <method selector='setCapacity:'>
-      <arg name='size' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPageCacheSize:'>
-      <arg name='size' declared_type='NSUInteger' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='WebDataSource'>
-    <method selector='addSubresource:'>
-      <arg name='subresource' declared_type='WebResource*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='data'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='initWithRequest:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='initialRequest'>
-      <retval declared_type='NSURLRequest*' type='@'/>
-    </method>
-    <method selector='isLoading'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='mainResource'>
-      <retval declared_type='WebResource*' type='@'/>
-    </method>
-    <method selector='pageTitle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='representation'>
-      <retval declared_type='id &lt;WebDocumentRepresentation&gt;' type='@'/>
-    </method>
-    <method selector='request'>
-      <retval declared_type='NSMutableURLRequest*' type='@'/>
-    </method>
-    <method selector='response'>
-      <retval declared_type='NSURLResponse*' type='@'/>
-    </method>
-    <method selector='subresourceForURL:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='WebResource*' type='@'/>
-    </method>
-    <method selector='subresources'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='textEncodingName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='unreachableURL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='webArchive'>
-      <retval declared_type='WebArchive*' type='@'/>
-    </method>
-    <method selector='webFrame'>
-      <retval declared_type='WebFrame*' type='@'/>
-    </method>
-  </class>
-  <class name='WebFrame'>
-    <method selector='DOMDocument'>
-      <retval declared_type='DOMDocument*' type='@'/>
-    </method>
-    <method selector='childFrames'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='dataSource'>
-      <retval declared_type='WebDataSource*' type='@'/>
-    </method>
-    <method selector='findFrameNamed:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='WebFrame*' type='@'/>
-    </method>
-    <method selector='frameElement'>
-      <retval declared_type='DOMHTMLElement*' type='@'/>
-    </method>
-    <method selector='frameView'>
-      <retval declared_type='WebFrameView*' type='@'/>
-    </method>
-    <method selector='globalContext'>
-      <retval declared_type='JSGlobalContextRef' type='^{OpaqueJSContext=}'/>
-    </method>
-    <method selector='initWithName:webFrameView:webView:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='view' declared_type='WebFrameView*' type='@' index='1'/>
-      <arg name='webView' declared_type='WebView*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='loadAlternateHTMLString:baseURL:forUnreachableURL:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='baseURL' declared_type='NSURL*' type='@' index='1'/>
-      <arg name='unreachableURL' declared_type='NSURL*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='loadArchive:'>
-      <arg name='archive' declared_type='WebArchive*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='loadData:MIMEType:textEncodingName:baseURL:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='MIMEType' declared_type='NSString*' type='@' index='1'/>
-      <arg name='encodingName' declared_type='NSString*' type='@' index='2'/>
-      <arg name='URL' declared_type='NSURL*' type='@' index='3'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='loadHTMLString:baseURL:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='URL' declared_type='NSURL*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='loadRequest:'>
-      <arg name='request' declared_type='NSURLRequest*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='name'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='parentFrame'>
-      <retval declared_type='WebFrame*' type='@'/>
-    </method>
-    <method selector='provisionalDataSource'>
-      <retval declared_type='WebDataSource*' type='@'/>
-    </method>
-    <method selector='reload'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopLoading'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webView'>
-      <retval declared_type='WebView*' type='@'/>
-    </method>
-    <method selector='windowObject'>
-      <retval declared_type='WebScriptObject*' type='@'/>
-    </method>
-  </class>
-  <class name='WebFrameView'>
-    <method selector='allowsScrolling'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canPrintHeadersAndFooters'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='documentView'>
-      <retval declared_type='NSView &lt;WebDocumentView&gt;*' type='@'/>
-    </method>
-    <method selector='documentViewShouldHandlePrint'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='printDocumentView'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='printOperationWithPrintInfo:'>
-      <arg name='printInfo' declared_type='NSPrintInfo*' type='@' index='0'/>
-      <retval declared_type='NSPrintOperation*' type='@'/>
-    </method>
-    <method selector='setAllowsScrolling:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='webFrame'>
-      <retval declared_type='WebFrame*' type='@'/>
-    </method>
-  </class>
-  <class name='WebHistory'>
-    <method selector='addItems:'>
-      <arg name='newItems' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='historyAgeInDaysLimit'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='historyItemLimit'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='itemForURL:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='WebHistoryItem*' type='@'/>
-    </method>
-    <method selector='loadFromURL:error:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='optionalSharedHistory'>
-      <retval declared_type='WebHistory*' type='@'/>
-    </method>
-    <method selector='orderedItemsLastVisitedOnDay:'>
-      <arg name='calendarDate' declared_type='NSCalendarDate*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='orderedLastVisitedDays'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='removeAllItems'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeItems:'>
-      <arg name='items' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='saveToURL:error:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <arg name='error' declared_type='NSError**' type='^@' index='1'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='setHistoryAgeInDaysLimit:'>
-      <arg name='limit' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHistoryItemLimit:'>
-      <arg name='limit' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setOptionalSharedHistory:'>
-      <arg name='history' declared_type='WebHistory*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <class name='WebHistoryItem'>
-    <method selector='URLString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='alternateTitle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='icon'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='initWithURLString:title:lastVisitedTimeInterval:'>
-      <arg name='URLString' declared_type='NSString*' type='@' index='0'/>
-      <arg name='title' declared_type='NSString*' type='@' index='1'/>
-      <arg name='time' declared_type='NSTimeInterval' type='d' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='lastVisitedTimeInterval'>
-      <retval declared_type='NSTimeInterval' type='d'/>
-    </method>
-    <method selector='originalURLString'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setAlternateTitle:'>
-      <arg name='alternateTitle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='title'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='WebPreferences'>
-    <method selector='allowsAnimatedImageLooping'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='allowsAnimatedImages'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='arePlugInsEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='autosaves'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='cacheModel'>
-      <retval declared_type='WebCacheModel' type='I' type64='Q'/>
-    </method>
-    <method selector='cursiveFontFamily'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='defaultFixedFontSize'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='defaultFontSize'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='defaultTextEncodingName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fantasyFontFamily'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='fixedFontFamily'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='identifier'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='initWithIdentifier:'>
-      <arg name='anIdentifier' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isJavaEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isJavaScriptEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='javaScriptCanOpenWindowsAutomatically'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='loadsImagesAutomatically'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='minimumFontSize'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='minimumLogicalFontSize'>
-      <retval declared_type='int' type='i'/>
-    </method>
-    <method selector='privateBrowsingEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='sansSerifFontFamily'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='serifFontFamily'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='setAllowsAnimatedImageLooping:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAllowsAnimatedImages:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setAutosaves:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCacheModel:'>
-      <arg name='cacheModel' declared_type='WebCacheModel' type='I' type64='Q' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCursiveFontFamily:'>
-      <arg name='family' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDefaultFixedFontSize:'>
-      <arg name='size' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDefaultFontSize:'>
-      <arg name='size' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDefaultTextEncodingName:'>
-      <arg name='encoding' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFantasyFontFamily:'>
-      <arg name='family' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFixedFontFamily:'>
-      <arg name='family' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setJavaEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setJavaScriptCanOpenWindowsAutomatically:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setJavaScriptEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setLoadsImagesAutomatically:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinimumFontSize:'>
-      <arg name='size' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMinimumLogicalFontSize:'>
-      <arg name='size' declared_type='int' type='i' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPlugInsEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPrivateBrowsingEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSansSerifFontFamily:'>
-      <arg name='family' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSerifFontFamily:'>
-      <arg name='family' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShouldPrintBackgrounds:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setStandardFontFamily:'>
-      <arg name='family' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTabsToLinks:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUserStyleSheetEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUserStyleSheetLocation:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUsesPageCache:'>
-      <arg name='usesPageCache' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shouldPrintBackgrounds'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='standardFontFamily'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='standardPreferences'>
-      <retval declared_type='WebPreferences*' type='@'/>
-    </method>
-    <method selector='tabsToLinks'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='userStyleSheetEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='userStyleSheetLocation'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='usesPageCache'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-  </class>
-  <class name='WebResource'>
-    <method selector='MIMEType'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='URL'>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method selector='data'>
-      <retval declared_type='NSData*' type='@'/>
-    </method>
-    <method selector='frameName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='initWithData:URL:MIMEType:textEncodingName:frameName:'>
-      <arg name='data' declared_type='NSData*' type='@' index='0'/>
-      <arg name='URL' declared_type='NSURL*' type='@' index='1'/>
-      <arg name='MIMEType' declared_type='NSString*' type='@' index='2'/>
-      <arg name='textEncodingName' declared_type='NSString*' type='@' index='3'/>
-      <arg name='frameName' declared_type='NSString*' type='@' index='4'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='textEncodingName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-  </class>
-  <class name='WebScriptObject'>
-    <method selector='JSObject'>
-      <retval declared_type='JSObjectRef' type='^{OpaqueJSValue=}'/>
-    </method>
-    <method selector='callWebScriptMethod:withArguments:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <arg name='args' declared_type='NSArray*' type='@' index='1'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='evaluateWebScript:'>
-      <arg name='script' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='removeWebScriptKey:'>
-      <arg name='name' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setException:'>
-      <arg name='description' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setWebScriptValueAtIndex:value:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <arg name='value' declared_type='id' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stringRepresentation'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='throwException:'>
-      <arg name='exceptionMessage' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='webScriptValueAtIndex:'>
-      <arg name='index' declared_type='unsigned' type='I' index='0'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-  </class>
-  <class name='WebUndefined'>
-    <method class_method='true' selector='undefined'>
-      <retval declared_type='WebUndefined*' type='@'/>
-    </method>
-  </class>
-  <class name='WebView'>
-    <method class_method='true' selector='MIMETypesShownAsHTML'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='UIDelegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method class_method='true' selector='URLFromPasteboard:'>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='NSURL*' type='@'/>
-    </method>
-    <method class_method='true' selector='URLTitleFromPasteboard:'>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='alignCenter:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='alignJustified:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='alignLeft:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='alignRight:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='applicationNameForUserAgent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='applyStyle:'>
-      <arg name='style' declared_type='DOMCSSStyleDeclaration*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='backForwardList'>
-      <retval declared_type='WebBackForwardList*' type='@'/>
-    </method>
-    <method selector='canGoBack'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canGoForward'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canMakeTextLarger'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canMakeTextSmaller'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='canMakeTextStandardSize'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='canShowMIMEType:'>
-      <arg name='MIMEType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method class_method='true' selector='canShowMIMETypeAsHTML:'>
-      <arg name='MIMEType' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='changeAttributes:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='changeColor:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='changeDocumentBackgroundColor:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='changeFont:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='checkSpelling:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='close'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='computedStyleForElement:pseudoElement:'>
-      <arg name='element' declared_type='DOMElement*' type='@' index='0'/>
-      <arg name='pseudoElement' declared_type='NSString*' type='@' index='1'/>
-      <retval declared_type='DOMCSSStyleDeclaration*' type='@'/>
-    </method>
-    <method selector='copy:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='copyFont:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='customTextEncodingName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='customUserAgent'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='cut:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='delete:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='deleteSelection'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='downloadDelegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='drawsBackground'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='editableDOMRangeForPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='DOMRange*' type='@'/>
-    </method>
-    <method selector='editingDelegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='elementAtPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='NSDictionary*' type='@'/>
-    </method>
-    <method selector='estimatedProgress'>
-      <retval declared_type='double' type='d'/>
-    </method>
-    <method selector='frameLoadDelegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='goBack'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='goBack:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='goForward'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='goForward:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='goToBackForwardItem:'>
-      <arg name='item' declared_type='WebHistoryItem*' type='@' index='0'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='groupName'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='hostWindow'>
-      <retval declared_type='NSWindow*' type='@'/>
-    </method>
-    <method selector='initWithFrame:frameName:groupName:'>
-      <arg name='frame' declared_type='NSRect' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' index='0'/>
-      <arg name='frameName' declared_type='NSString*' type='@' index='1'/>
-      <arg name='groupName' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='isContinuousSpellCheckingEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isEditable'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='isLoading'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='mainFrame'>
-      <retval declared_type='WebFrame*' type='@'/>
-    </method>
-    <method selector='mainFrameDocument'>
-      <retval declared_type='DOMDocument*' type='@'/>
-    </method>
-    <method selector='mainFrameIcon'>
-      <retval declared_type='NSImage*' type='@'/>
-    </method>
-    <method selector='mainFrameTitle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='mainFrameURL'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='maintainsInactiveSelection'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='makeTextLarger:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='makeTextSmaller:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='makeTextStandardSize:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='mediaStyle'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='moveDragCaretToPoint:'>
-      <arg name='point' declared_type='NSPoint' type='{_NSPoint=ff}' type64='{CGPoint=dd}' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveToBeginningOfSentence:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveToBeginningOfSentenceAndModifySelection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveToEndOfSentence:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='moveToEndOfSentenceAndModifySelection:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='paste:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pasteAsPlainText:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pasteAsRichText:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pasteFont:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='pasteboardTypesForElement:'>
-      <arg name='element' declared_type='NSDictionary*' type='@' index='0'/>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='pasteboardTypesForSelection'>
-      <retval declared_type='NSArray*' type='@'/>
-    </method>
-    <method selector='performFindPanelAction:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='policyDelegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='preferences'>
-      <retval declared_type='WebPreferences*' type='@'/>
-    </method>
-    <method selector='preferencesIdentifier'>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method class_method='true' selector='registerURLSchemeAsLocal:'>
-      <arg name='scheme' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='registerViewClass:representationClass:forMIMEType:'>
-      <arg name='viewClass' declared_type='Class' type='#' index='0'/>
-      <arg name='representationClass' declared_type='Class' type='#' index='1'/>
-      <arg name='MIMEType' declared_type='NSString*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='reload:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='removeDragCaret'>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceSelectionWithArchive:'>
-      <arg name='archive' declared_type='WebArchive*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceSelectionWithMarkupString:'>
-      <arg name='markupString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceSelectionWithNode:'>
-      <arg name='node' declared_type='DOMNode*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='replaceSelectionWithText:'>
-      <arg name='text' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='resourceLoadDelegate'>
-      <retval declared_type='id' type='@'/>
-    </method>
-    <method selector='searchFor:direction:caseSensitive:wrap:'>
-      <arg name='string' declared_type='NSString*' type='@' index='0'/>
-      <arg name='forward' declared_type='BOOL' type='B' index='1'/>
-      <arg name='caseFlag' declared_type='BOOL' type='B' index='2'/>
-      <arg name='wrapFlag' declared_type='BOOL' type='B' index='3'/>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='selectSentence:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='selectedDOMRange'>
-      <retval declared_type='DOMRange*' type='@'/>
-    </method>
-    <method selector='selectedFrame'>
-      <retval declared_type='WebFrame*' type='@'/>
-    </method>
-    <method selector='selectionAffinity'>
-      <retval declared_type='NSSelectionAffinity' type='I' type64='Q'/>
-    </method>
-    <method selector='setApplicationNameForUserAgent:'>
-      <arg name='applicationName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setContinuousSpellCheckingEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCustomTextEncodingName:'>
-      <arg name='encodingName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setCustomUserAgent:'>
-      <arg name='userAgentString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDownloadDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setDrawsBackground:'>
-      <arg name='drawsBackround' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEditable:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setEditingDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setFrameLoadDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setGroupName:'>
-      <arg name='groupName' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setHostWindow:'>
-      <arg name='hostWindow' declared_type='NSWindow*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method class_method='true' selector='setMIMETypesShownAsHTML:'>
-      <arg name='MIMETypes' declared_type='NSArray*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMainFrameURL:'>
-      <arg name='URLString' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMaintainsBackForwardList:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setMediaStyle:'>
-      <arg name='mediaStyle' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPolicyDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPreferences:'>
-      <arg name='prefs' declared_type='WebPreferences*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setPreferencesIdentifier:'>
-      <arg name='anIdentifier' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setResourceLoadDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSelectedDOMRange:affinity:'>
-      <arg name='range' declared_type='DOMRange*' type='@' index='0'/>
-      <arg name='selectionAffinity' declared_type='NSSelectionAffinity' type='I' type64='Q' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setShouldCloseWithWindow:'>
-      <arg name='close' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setSmartInsertDeleteEnabled:'>
-      <arg name='flag' declared_type='BOOL' type='B' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTextSizeMultiplier:'>
-      <arg name='multiplier' declared_type='float' type='f' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setTypingStyle:'>
-      <arg name='style' declared_type='DOMCSSStyleDeclaration*' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='setUIDelegate:'>
-      <arg name='delegate' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='shouldCloseWithWindow'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='showGuessPanel:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='smartInsertDeleteEnabled'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='spellCheckerDocumentTag'>
-      <retval declared_type='NSInteger' type='i' type64='q'/>
-    </method>
-    <method selector='startSpeaking:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopLoading:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stopSpeaking:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='stringByEvaluatingJavaScriptFromString:'>
-      <arg name='script' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='styleDeclarationWithText:'>
-      <arg name='text' declared_type='NSString*' type='@' index='0'/>
-      <retval declared_type='DOMCSSStyleDeclaration*' type='@'/>
-    </method>
-    <method selector='supportsTextEncoding'>
-      <retval declared_type='BOOL' type='B'/>
-    </method>
-    <method selector='takeStringURLFrom:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='textSizeMultiplier'>
-      <retval declared_type='float' type='f'/>
-    </method>
-    <method selector='toggleContinuousSpellChecking:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='toggleSmartInsertDelete:'>
-      <arg name='sender' declared_type='id' type='@' index='0'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='typingStyle'>
-      <retval declared_type='DOMCSSStyleDeclaration*' type='@'/>
-    </method>
-    <method selector='undoManager'>
-      <retval declared_type='NSUndoManager*' type='@'/>
-    </method>
-    <method selector='userAgentForURL:'>
-      <arg name='URL' declared_type='NSURL*' type='@' index='0'/>
-      <retval declared_type='NSString*' type='@'/>
-    </method>
-    <method selector='windowScriptObject'>
-      <retval declared_type='WebScriptObject*' type='@'/>
-    </method>
-    <method selector='writeElement:withPasteboardTypes:toPasteboard:'>
-      <arg name='element' declared_type='NSDictionary*' type='@' index='0'/>
-      <arg name='types' declared_type='NSArray*' type='@' index='1'/>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='2'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-    <method selector='writeSelectionWithPasteboardTypes:toPasteboard:'>
-      <arg name='types' declared_type='NSArray*' type='@' index='0'/>
-      <arg name='pasteboard' declared_type='NSPasteboard*' type='@' index='1'/>
-      <retval declared_type='void' type='v'/>
-    </method>
-  </class>
-  <informal_protocol name='WebDownloadDelegate'>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='downloadWindowForAuthenticationSheet:'>
-      <arg name='download' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='WebFrameLoadDelegate'>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:didCancelClientRedirectForFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='frame' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:didChangeLocationWithinPageForFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='frame' index='1'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='webView:didClearWindowObject:forFrame:'>
-      <arg name='webView' index='0'/>
-      <arg name='windowObject' index='1'/>
-      <arg name='frame' index='2'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:didCommitLoadForFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='frame' index='1'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='webView:didFailLoadWithError:forFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='error' index='1'/>
-      <arg name='frame' index='2'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='webView:didFailProvisionalLoadWithError:forFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='error' index='1'/>
-      <arg name='frame' index='2'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:didFinishLoadForFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='frame' index='1'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='webView:didReceiveIcon:forFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='image' index='1'/>
-      <arg name='frame' index='2'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:didReceiveServerRedirectForProvisionalLoadForFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='frame' index='1'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='webView:didReceiveTitle:forFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='title' index='1'/>
-      <arg name='frame' index='2'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:didStartProvisionalLoadForFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='frame' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:willCloseFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='frame' index='1'/>
-    </method>
-    <method type='v32@0:4@8@12d16@24@28' type64='v56@0:8@16@24d32@40@48' selector='webView:willPerformClientRedirectToURL:delay:fireDate:forFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='URL' index='1'/>
-      <arg name='seconds' index='2'/>
-      <arg name='date' index='3'/>
-      <arg name='frame' index='4'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:windowScriptObjectAvailable:'>
-      <arg name='webView' index='0'/>
-      <arg name='windowScriptObject' index='1'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='WebJavaPlugIn'>
-    <method type='(jvalue=CBSsiqfd^{_jobject})36@0:4^{_jobject=}8c12i16^{_jmethodID=}20^(jvalue=CcSsiqfd^{_jobject})24@28^@32' type64='(jvalue=CBSsiqfd^{_jobject})64@0:8^{_jobject=}16c24i28^{_jmethodID=}32^(jvalue=CcSsiqfd^{_jobject})40@48^@56' selector='webPlugInCallJava:isStatic:returnType:method:arguments:callingURL:exceptionDescription:'>
-      <arg name='object' index='0'/>
-      <arg name='isStatic' index='1'/>
-      <arg name='returnType' index='2'/>
-      <arg name='method' index='3'/>
-      <arg name='args' index='4'/>
-      <arg name='url' index='5'/>
-      <arg name='exceptionString' index='6'/>
-    </method>
-    <method type='^{_jobject=}8@0:4' type64='^{_jobject=}16@0:8' selector='webPlugInGetApplet'/>
-  </informal_protocol>
-  <informal_protocol name='WebPlugIn'>
-    <method type='@8@0:4' type64='@16@0:8' selector='objectForWebScript'/>
-    <method type='v8@0:4' type64='v16@0:8' selector='webPlugInDestroy'/>
-    <method type='v8@0:4' type64='v16@0:8' selector='webPlugInInitialize'/>
-    <method type='v12@0:4B8' type64='v20@0:8B16' selector='webPlugInSetIsSelected:'>
-      <arg name='isSelected' index='0'/>
-    </method>
-    <method type='v8@0:4' type64='v16@0:8' selector='webPlugInStart'/>
-    <method type='v8@0:4' type64='v16@0:8' selector='webPlugInStop'/>
-  </informal_protocol>
-  <informal_protocol name='WebPlugInContainer'>
-    <method type='@8@0:4' type64='@16@0:8' selector='webFrame'/>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webPlugInContainerLoadRequest:inFrame:'>
-      <arg name='request' index='0'/>
-      <arg name='target' index='1'/>
-    </method>
-    <method type='@8@0:4' type64='@16@0:8' selector='webPlugInContainerSelectionColor'/>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='webPlugInContainerShowStatus:'>
-      <arg name='message' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='WebPolicyDelegate'>
-    <method type='v28@0:4@8@12@16@20@24' type64='v56@0:8@16@24@32@40@48' selector='webView:decidePolicyForMIMEType:request:frame:decisionListener:'>
-      <arg name='webView' index='0'/>
-      <arg name='type' index='1'/>
-      <arg name='request' index='2'/>
-      <arg name='frame' index='3'/>
-      <arg name='listener' index='4'/>
-    </method>
-    <method type='v28@0:4@8@12@16@20@24' type64='v56@0:8@16@24@32@40@48' selector='webView:decidePolicyForNavigationAction:request:frame:decisionListener:'>
-      <arg name='webView' index='0'/>
-      <arg name='actionInformation' index='1'/>
-      <arg name='request' index='2'/>
-      <arg name='frame' index='3'/>
-      <arg name='listener' index='4'/>
-    </method>
-    <method type='v28@0:4@8@12@16@20@24' type64='v56@0:8@16@24@32@40@48' selector='webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:'>
-      <arg name='webView' index='0'/>
-      <arg name='actionInformation' index='1'/>
-      <arg name='request' index='2'/>
-      <arg name='frameName' index='3'/>
-      <arg name='listener' index='4'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='webView:unableToImplementPolicyWithError:frame:'>
-      <arg name='webView' index='0'/>
-      <arg name='error' index='1'/>
-      <arg name='frame' index='2'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='WebResourceLoadDelegate'>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='webView:identifierForInitialRequest:fromDataSource:'>
-      <arg name='sender' index='0'/>
-      <arg name='request' index='1'/>
-      <arg name='dataSource' index='2'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='webView:plugInFailedWithError:dataSource:'>
-      <arg name='sender' index='0'/>
-      <arg name='error' index='1'/>
-      <arg name='dataSource' index='2'/>
-    </method>
-    <method type='v24@0:4@8@12@16@20' type64='v48@0:8@16@24@32@40' selector='webView:resource:didCancelAuthenticationChallenge:fromDataSource:'>
-      <arg name='sender' index='0'/>
-      <arg name='identifier' index='1'/>
-      <arg name='challenge' index='2'/>
-      <arg name='dataSource' index='3'/>
-    </method>
-    <method type='v24@0:4@8@12@16@20' type64='v48@0:8@16@24@32@40' selector='webView:resource:didFailLoadingWithError:fromDataSource:'>
-      <arg name='sender' index='0'/>
-      <arg name='identifier' index='1'/>
-      <arg name='error' index='2'/>
-      <arg name='dataSource' index='3'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='webView:resource:didFinishLoadingFromDataSource:'>
-      <arg name='sender' index='0'/>
-      <arg name='identifier' index='1'/>
-      <arg name='dataSource' index='2'/>
-    </method>
-    <method type='v24@0:4@8@12@16@20' type64='v48@0:8@16@24@32@40' selector='webView:resource:didReceiveAuthenticationChallenge:fromDataSource:'>
-      <arg name='sender' index='0'/>
-      <arg name='identifier' index='1'/>
-      <arg name='challenge' index='2'/>
-      <arg name='dataSource' index='3'/>
-    </method>
-    <method type='v24@0:4@8@12i16@20' type64='v48@0:8@16@24q32@40' selector='webView:resource:didReceiveContentLength:fromDataSource:'>
-      <arg name='sender' index='0'/>
-      <arg name='identifier' index='1'/>
-      <arg name='length' index='2'/>
-      <arg name='dataSource' index='3'/>
-    </method>
-    <method type='v24@0:4@8@12@16@20' type64='v48@0:8@16@24@32@40' selector='webView:resource:didReceiveResponse:fromDataSource:'>
-      <arg name='sender' index='0'/>
-      <arg name='identifier' index='1'/>
-      <arg name='response' index='2'/>
-      <arg name='dataSource' index='3'/>
-    </method>
-    <method type='@28@0:4@8@12@16@20@24' type64='@56@0:8@16@24@32@40@48' selector='webView:resource:willSendRequest:redirectResponse:fromDataSource:'>
-      <arg name='sender' index='0'/>
-      <arg name='identifier' index='1'/>
-      <arg name='request' index='2'/>
-      <arg name='redirectResponse' index='3'/>
-      <arg name='dataSource' index='4'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='WebScripting'>
-    <method type='v8@0:4' type64='v16@0:8' selector='finalizeForWebScript'/>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='invokeDefaultMethodWithArguments:'>
-      <arg name='args' index='0'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='invokeUndefinedMethodFromWebScript:withArguments:'>
-      <arg name='name' index='0'/>
-      <arg name='args' index='1'/>
-    </method>
-    <method class_method='true' type='B12@0:4r*8' type64='B24@0:8r*16' selector='isKeyExcludedFromWebScript:'>
-      <arg name='name' index='0'/>
-    </method>
-    <method class_method='true' type='B12@0:4:8' type64='B24@0:8:16' selector='isSelectorExcludedFromWebScript:'>
-      <arg name='aSelector' index='0'/>
-    </method>
-    <method class_method='true' type='@12@0:4r*8' type64='@24@0:8r*16' selector='webScriptNameForKey:'>
-      <arg name='name' index='0'/>
-    </method>
-    <method class_method='true' type='@12@0:4:8' type64='@24@0:8:16' selector='webScriptNameForSelector:'>
-      <arg name='aSelector' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='WebUIDelegate'>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='webView:contextMenuItemsForElement:defaultMenuItems:'>
-      <arg name='sender' index='0'/>
-      <arg name='element' index='1'/>
-      <arg name='defaultMenuItems' index='2'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='webView:createWebViewModalDialogWithRequest:'>
-      <arg name='sender' index='0'/>
-      <arg name='request' index='1'/>
-    </method>
-    <method type='@16@0:4@8@12' type64='@32@0:8@16@24' selector='webView:createWebViewWithRequest:'>
-      <arg name='sender' index='0'/>
-      <arg name='request' index='1'/>
-    </method>
-    <method type='I16@0:4@8@12' type64='Q32@0:8@16@24' selector='webView:dragDestinationActionMaskForDraggingInfo:'>
-      <arg name='webView' index='0'/>
-      <arg name='draggingInfo' index='1'/>
-    </method>
-    <method type='I20@0:4@8{_NSPoint=ff}12' type64='Q40@0:8@16{CGPoint=dd}24' selector='webView:dragSourceActionMaskForPoint:'>
-      <arg name='webView' index='0'/>
-      <arg name='point' index='1'/>
-    </method>
-    <method type='v28@0:4@8{_NSRect={_NSPoint=ff}{_NSSize=ff}}12' type64='v56@0:8@16{CGRect={CGPoint=dd}{CGSize=dd}}24' selector='webView:drawFooterInRect:'>
-      <arg name='sender' index='0'/>
-      <arg name='rect' index='1'/>
-    </method>
-    <method type='v28@0:4@8{_NSRect={_NSPoint=ff}{_NSSize=ff}}12' type64='v56@0:8@16{CGRect={CGPoint=dd}{CGSize=dd}}24' selector='webView:drawHeaderInRect:'>
-      <arg name='sender' index='0'/>
-      <arg name='rect' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:makeFirstResponder:'>
-      <arg name='sender' index='0'/>
-      <arg name='responder' index='1'/>
-    </method>
-    <method type='v20@0:4@8@12I16' type64='v40@0:8@16@24Q32' selector='webView:mouseDidMoveOverElement:modifierFlags:'>
-      <arg name='sender' index='0'/>
-      <arg name='elementInformation' index='1'/>
-      <arg name='modifierFlags' index='2'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:printFrameView:'>
-      <arg name='sender' index='0'/>
-      <arg name='frameView' index='1'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='webView:runBeforeUnloadConfirmPanelWithMessage:initiatedByFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='message' index='1'/>
-      <arg name='frame' index='2'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:runJavaScriptAlertPanelWithMessage:'>
-      <arg name='sender' index='0'/>
-      <arg name='message' index='1'/>
-    </method>
-    <method type='v20@0:4@8@12@16' type64='v40@0:8@16@24@32' selector='webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='message' index='1'/>
-      <arg name='frame' index='2'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='webView:runJavaScriptConfirmPanelWithMessage:'>
-      <arg name='sender' index='0'/>
-      <arg name='message' index='1'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='message' index='1'/>
-      <arg name='frame' index='2'/>
-    </method>
-    <method type='@20@0:4@8@12@16' type64='@40@0:8@16@24@32' selector='webView:runJavaScriptTextInputPanelWithPrompt:defaultText:'>
-      <arg name='sender' index='0'/>
-      <arg name='prompt' index='1'/>
-      <arg name='defaultText' index='2'/>
-    </method>
-    <method type='@24@0:4@8@12@16@20' type64='@48@0:8@16@24@32@40' selector='webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='prompt' index='1'/>
-      <arg name='defaultText' index='2'/>
-      <arg name='frame' index='3'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:runOpenPanelForFileButtonWithResultListener:'>
-      <arg name='sender' index='0'/>
-      <arg name='resultListener' index='1'/>
-    </method>
-    <method type='v28@0:4@8{_NSRect={_NSPoint=ff}{_NSSize=ff}}12' type64='v56@0:8@16{CGRect={CGPoint=dd}{CGSize=dd}}24' selector='webView:setContentRect:'>
-      <arg name='sender' index='0'/>
-      <arg name='frame' index='1'/>
-    </method>
-    <method type='v28@0:4@8{_NSRect={_NSPoint=ff}{_NSSize=ff}}12' type64='v56@0:8@16{CGRect={CGPoint=dd}{CGSize=dd}}24' selector='webView:setFrame:'>
-      <arg name='sender' index='0'/>
-      <arg name='frame' index='1'/>
-    </method>
-    <method type='v16@0:4@8B12' type64='v28@0:8@16B24' selector='webView:setResizable:'>
-      <arg name='sender' index='0'/>
-      <arg name='resizable' index='1'/>
-    </method>
-    <method type='v16@0:4@8B12' type64='v28@0:8@16B24' selector='webView:setStatusBarVisible:'>
-      <arg name='sender' index='0'/>
-      <arg name='visible' index='1'/>
-    </method>
-    <method type='v16@0:4@8@12' type64='v32@0:8@16@24' selector='webView:setStatusText:'>
-      <arg name='sender' index='0'/>
-      <arg name='text' index='1'/>
-    </method>
-    <method type='v16@0:4@8B12' type64='v28@0:8@16B24' selector='webView:setToolbarsVisible:'>
-      <arg name='sender' index='0'/>
-      <arg name='visible' index='1'/>
-    </method>
-    <method type='B20@0:4@8:12@16' type64='B40@0:8@16:24@32' selector='webView:shouldPerformAction:fromSender:'>
-      <arg name='webView' index='0'/>
-      <arg name='action' index='1'/>
-      <arg name='sender' index='2'/>
-    </method>
-    <method type='B20@0:4@8@12B16' type64='B36@0:8@16@24B32' selector='webView:validateUserInterfaceItem:defaultValidation:'>
-      <arg name='webView' index='0'/>
-      <arg name='item' index='1'/>
-      <arg name='defaultValidation' index='2'/>
-    </method>
-    <method type='v20@0:4@8i12@16' type64='v36@0:8@16i24@28' selector='webView:willPerformDragDestinationAction:forDraggingInfo:'>
-      <arg name='webView' index='0'/>
-      <arg name='action' index='1'/>
-      <arg name='draggingInfo' index='2'/>
-    </method>
-    <method type='v28@0:4@8i12{_NSPoint=ff}16@24' type64='v52@0:8@16i24{CGPoint=dd}28@44' selector='webView:willPerformDragSourceAction:fromPoint:withPasteboard:'>
-      <arg name='webView' index='0'/>
-      <arg name='action' index='1'/>
-      <arg name='point' index='2'/>
-      <arg name='pasteboard' index='3'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='webViewAreToolbarsVisible:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='webViewClose:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}12@0:4@8' type64='{CGRect={CGPoint=dd}{CGSize=dd}}24@0:8@16' selector='webViewContentRect:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='webViewFirstResponder:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='webViewFocus:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='f12@0:4@8' type64='f24@0:8@16' selector='webViewFooterHeight:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}12@0:4@8' type64='{CGRect={CGPoint=dd}{CGSize=dd}}24@0:8@16' selector='webViewFrame:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='f12@0:4@8' type64='f24@0:8@16' selector='webViewHeaderHeight:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='webViewIsResizable:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='B12@0:4@8' type64='B24@0:8@16' selector='webViewIsStatusBarVisible:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='webViewRunModal:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='webViewShow:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='webViewStatusText:'>
-      <arg name='sender' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='webViewUnfocus:'>
-      <arg name='sender' index='0'/>
-    </method>
-  </informal_protocol>
-  <informal_protocol name='WebViewEditingDelegate'>
-    <method type='@12@0:4@8' type64='@24@0:8@16' selector='undoManagerForWebView:'>
-      <arg name='webView' index='0'/>
-    </method>
-    <method type='B16@0:4@8:12' type64='B32@0:8@16:24' selector='webView:doCommandBySelector:'>
-      <arg name='webView' index='0'/>
-      <arg name='selector' index='1'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='webView:shouldApplyStyle:toElementsInDOMRange:'>
-      <arg name='webView' index='0'/>
-      <arg name='style' index='1'/>
-      <arg name='range' index='2'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='webView:shouldBeginEditingInDOMRange:'>
-      <arg name='webView' index='0'/>
-      <arg name='range' index='1'/>
-    </method>
-    <method type='B28@0:4@8@12@16I20B24' type64='B52@0:8@16@24@32Q40B48' selector='webView:shouldChangeSelectedDOMRange:toDOMRange:affinity:stillSelecting:'>
-      <arg name='webView' index='0'/>
-      <arg name='currentRange' index='1'/>
-      <arg name='proposedRange' index='2'/>
-      <arg name='selectionAffinity' index='3'/>
-      <arg name='flag' index='4'/>
-    </method>
-    <method type='B20@0:4@8@12@16' type64='B40@0:8@16@24@32' selector='webView:shouldChangeTypingStyle:toStyle:'>
-      <arg name='webView' index='0'/>
-      <arg name='currentStyle' index='1'/>
-      <arg name='proposedStyle' index='2'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='webView:shouldDeleteDOMRange:'>
-      <arg name='webView' index='0'/>
-      <arg name='range' index='1'/>
-    </method>
-    <method type='B16@0:4@8@12' type64='B32@0:8@16@24' selector='webView:shouldEndEditingInDOMRange:'>
-      <arg name='webView' index='0'/>
-      <arg name='range' index='1'/>
-    </method>
-    <method type='B24@0:4@8@12@16i20' type64='B44@0:8@16@24@32i40' selector='webView:shouldInsertNode:replacingDOMRange:givenAction:'>
-      <arg name='webView' index='0'/>
-      <arg name='node' index='1'/>
-      <arg name='range' index='2'/>
-      <arg name='action' index='3'/>
-    </method>
-    <method type='B24@0:4@8@12@16i20' type64='B44@0:8@16@24@32i40' selector='webView:shouldInsertText:replacingDOMRange:givenAction:'>
-      <arg name='webView' index='0'/>
-      <arg name='text' index='1'/>
-      <arg name='range' index='2'/>
-      <arg name='action' index='3'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='webViewDidBeginEditing:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='webViewDidChange:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='webViewDidChangeSelection:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='webViewDidChangeTypingStyle:'>
-      <arg name='notification' index='0'/>
-    </method>
-    <method type='v12@0:4@8' type64='v24@0:8@16' selector='webViewDidEndEditing:'>
-      <arg name='notification' index='0'/>
-    </method>
-  </informal_protocol>
-</signatures>
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt.tools/Sleak/org/eclipse/swt/tools/internal/Sleak.java b/bundles/org.eclipse.swt.tools/Sleak/org/eclipse/swt/tools/internal/Sleak.java
index cdf47bc719..cefe5f59a9 100644
--- a/bundles/org.eclipse.swt.tools/Sleak/org/eclipse/swt/tools/internal/Sleak.java
+++ b/bundles/org.eclipse.swt.tools/Sleak/org/eclipse/swt/tools/internal/Sleak.java
@@ -61,7 +61,7 @@ public static void main (String [] args) {
 	display.dispose ();
 }
 
-void open () {
+public void open () {
 	display = Display.getCurrent ();
 	shell = new Shell (display);
 	shell.setText ("S-Leak");
diff --git a/bundles/org.eclipse.swt.tools/build.properties b/bundles/org.eclipse.swt.tools/build.properties
index c038372cc5..03906c1bee 100644
--- a/bundles/org.eclipse.swt.tools/build.properties
+++ b/bundles/org.eclipse.swt.tools/build.properties
@@ -8,5 +8,18 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-source.swttools.jar=JNI Generation/
-bin.includes=about.html
\ No newline at end of file
+bin.includes = about.html,\
+               bin/,\
+               .,\
+               plugin.xml,\
+               plugin.properties,\
+               META-INF/,\
+               templates/
+src.includes = JNI Generation/,\
+               Mac Generation/,\
+               src/
+jars.compile.order = .
+output.. = bin/
+source.. = JNI Generation/,\
+           Mac Generation/,\
+           src/
diff --git a/bundles/org.eclipse.swt.tools/plugin.xml b/bundles/org.eclipse.swt.tools/plugin.xml
index 75c81f1b37..858c22fa85 100644
--- a/bundles/org.eclipse.swt.tools/plugin.xml
+++ b/bundles/org.eclipse.swt.tools/plugin.xml
@@ -1,13 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.swt.tools"
-   name="%pluginName"
-   version="3.4.0"
-   provider-name="%providerName">
+<plugin>
 
-   <requires>
-      <import plugin="org.eclipse.swt" export="true"/>
-   </requires>
+   <extension
+         point="org.eclipse.ui.views">
+      <category
+            name="SWT Tools"
+            id="org.eclipse.swt.swt.tools">
+      </category>
+      <view
+            name="Mac Generator View"
+            icon="icons/mac.gif"
+            category="org.eclipse.swt.swt.tools"
+            class="org.eclipse.swt.tools.views.MacGeneratorView"
+            id="org.eclipse.swt.tools.views.MacGeneratorView">
+      </view>
+   </extension>
 
+   <extension point="org.eclipse.ui.editors.templates">
+      <include
+            file="templates/jnitemplates.xml"
+            translations="$nl$/templates/jnitemplates.properties">
+      </include>
+   </extension>
 </plugin>
diff --git a/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/Activator.java b/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/Activator.java
new file mode 100644
index 0000000000..293921d3cf
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/Activator.java
@@ -0,0 +1,61 @@
+package org.eclipse.swt.tools;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.swt.tools";
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+}
diff --git a/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/views/MacGeneratorView.java b/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/views/MacGeneratorView.java
new file mode 100644
index 0000000000..e69b923159
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/views/MacGeneratorView.java
@@ -0,0 +1,133 @@
+package org.eclipse.swt.tools.views;
+
+import org.eclipse.swt.tools.internal.MacGenerator;
+import org.eclipse.swt.tools.internal.MacGeneratorUI;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.*;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.*;
+import org.eclipse.ui.*;
+
+
+/**
+ * This sample class demonstrates how to plug-in a new
+ * workbench view. The view shows data obtained from the
+ * model. The sample creates a dummy model on the fly,
+ * but a real implementation would connect to the model
+ * available either in this or another plug-in (e.g. the workspace).
+ * The view is connected to the model using a content provider.
+ * <p>
+ * The view uses a label provider to define how model
+ * objects should be presented in the view. Each
+ * view can present the same model objects using
+ * different labels and icons, if needed. Alternatively,
+ * a single label provider can be shared between views
+ * in order to ensure that objects of the same type are
+ * presented in the same way everywhere.
+ * <p>
+ */
+
+public class MacGeneratorView extends ViewPart {
+	private Action generateAction;
+	private MacGeneratorUI ui;
+	private IResource root;
+	private Job job;
+	private String mainClassName = "org.eclipse.swt.internal.cocoa.OS";
+	
+	class GenJob extends Job {
+		public GenJob() {
+			super("Mac Genarator");
+		}
+		protected IStatus run(IProgressMonitor monitor) {
+			ui.generate();
+			refresh();
+			MacGeneratorView.this.job = null;
+			return Status.OK_STATUS;
+		}
+	}
+	
+	/**
+	 * The constructor.
+	 */
+	public MacGeneratorView() {
+		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
+		root = workspace.findMember(new Path("org.eclipse.swt/Eclipse SWT PI/cocoa"));
+	}
+
+	/**
+	 * This is a callback that will allow us
+	 * to create the viewer and initialize it.
+	 */
+	public void createPartControl(Composite parent) {
+		String[] xmls = null;
+//		xmls = new String[]{
+//			"AppKitFull.bridgesupport",
+//			"FoundationFull.bridgesupport",
+//			"WebKitFull.bridgesupport",
+//		};
+		MacGenerator gen = new MacGenerator();
+		gen.setXmls(xmls);
+		gen.setOutputDir(root.getLocation().toPortableString());
+		gen.setMainClass(mainClassName);
+		ui = new MacGeneratorUI(gen);
+		ui.setActionsVisible(false);
+		ui.open(parent);
+
+		makeActions();
+		contributeToActionBars();
+	}
+
+	private void contributeToActionBars() {
+		IActionBars bars = getViewSite().getActionBars();
+		fillLocalPullDown(bars.getMenuManager());
+		fillLocalToolBar(bars.getToolBarManager());
+	}
+
+	private void fillLocalPullDown(IMenuManager manager) {
+		manager.add(generateAction);
+	}
+
+	private void fillLocalToolBar(IToolBarManager manager) {
+		manager.add(generateAction);
+	}
+	
+	void refresh() {
+		try {
+			root.refreshLocal(IResource.DEPTH_INFINITE, null);
+		} catch (CoreException e) {
+//			e.printStackTrace();
+		}
+	}
+	
+	void generate() {
+		job = new GenJob();
+		job.schedule();
+	}
+
+	private void makeActions() {
+		generateAction = new Action() {
+			public void run() {
+				generate();
+			}
+		};
+		generateAction.setText("Generate");
+		generateAction.setToolTipText("Generate");
+		generateAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
+			getImageDescriptor(ISharedImages.IMG_ETOOL_SAVE_EDIT));
+	}
+
+	/**
+	 * Passing the focus request to the viewer's control.
+	 */
+	public void setFocus() {
+		ui.setFocus();
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt.tools/templates/jnitemplates.properties b/bundles/org.eclipse.swt.tools/templates/jnitemplates.properties
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/templates/jnitemplates.properties
diff --git a/bundles/org.eclipse.swt.tools/templates/jnitemplates.xml b/bundles/org.eclipse.swt.tools/templates/jnitemplates.xml
new file mode 100644
index 0000000000..992f444dc3
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools/templates/jnitemplates.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<templates>
+	<template id="org.eclipse.swt.tools.templates.jniclass" autoinsert="true" context="java" deleted="false" description="" enabled="true" name="jniclass">/** @jniclass flags=${flags:link(no_gen,cpp)} */</template>
+	<template id="org.eclipse.swt.tools.templates.jnifield" autoinsert="true" context="java" deleted="false" description="" enabled="true" name="jnifield">/** @field accessor=${},flags=${flags:link(no_gen,no_wince)} */</template>
+	<template id="org.eclipse.swt.tools.templates.jnimethod" autoinsert="true" context="java" deleted="false" description="" enabled="true" name="jnimethod">/** @method accessor=${},flags=${flags:link(no_gen, address, const, 'const address', dynamic, jni, cast, cpp, 'no_gen cpp', new, 'no_gen new', delete, gcnew, gcobject, setter, getter, adder)} */</template>
+	<template id="org.eclipse.swt.tools.templates.jniparam" autoinsert="true" context="java" deleted="false" description="" enabled="true" name="jniparam">/** @param ${} cast=(${cursor}),flags=${flags:link(no_int,no_out,critical,init,struct,unicode,sentinel,gcobject,'no_in critical','no_out critical')} */</template>
+</templates>
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c
index ffa8ef23b4..1059680e36 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c
@@ -1,13 +1,13 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2007 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    IBM Corporation - initial API and implementation

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

+/*******************************************************************************
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    IBM Corporation - initial API and implementation
+ *******************************************************************************/
 
 #include "swt.h"
 #include "jawt_md.h"
@@ -15,14 +15,14 @@
 #define SWT_AWT_NATIVE(func) Java_org_eclipse_swt_awt_SWT_1AWT_##func
 
 #ifndef NO_getAWTHandle
-JNIEXPORT SWT_PTR JNICALL SWT_AWT_NATIVE(getAWTHandle)
+JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle)
 	(JNIEnv *env, jclass that, jobject canvas)
 {
 	JAWT awt;
 	JAWT_DrawingSurface* ds;
 	JAWT_DrawingSurfaceInfo* dsi;
 	JAWT_X11DrawingSurfaceInfo* dsi_x11;
-	SWT_PTR result = 0;
+	jintLong result = 0;
 	jint lock;
 
 	awt.version = JAWT_VERSION_1_3;
@@ -33,7 +33,7 @@ JNIEXPORT SWT_PTR JNICALL SWT_AWT_NATIVE(getAWTHandle)
 		 	if ((lock & JAWT_LOCK_ERROR) == 0) {
 			 	dsi = ds->GetDrawingSurfaceInfo(ds);
 				dsi_x11 = (JAWT_X11DrawingSurfaceInfo*)dsi->platformInfo;
-				result = (SWT_PTR)dsi_x11->drawable;
+				result = (jintLong)dsi_x11->drawable;
 				ds->FreeDrawingSurfaceInfo(dsi);
 				ds->Unlock(ds);
 			}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c
index b98afbf8a0..2fc186dfdf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c
@@ -15,14 +15,14 @@
 #define SWT_AWT_NATIVE(func) Java_org_eclipse_swt_awt_SWT_1AWT_##func
 
 #ifndef NO_getAWTHandle
-JNIEXPORT SWT_PTR JNICALL SWT_AWT_NATIVE(getAWTHandle)
+JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle)
 	(JNIEnv *env, jclass that, jobject canvas)
 {
 	JAWT awt;
 	JAWT_DrawingSurface* ds;
 	JAWT_DrawingSurfaceInfo* dsi;
 	JAWT_Win32DrawingSurfaceInfo* dsi_win;
-	SWT_PTR result = 0;
+	jintLong result = 0;
 	jint lock;
 
 	awt.version = JAWT_VERSION_1_3;
@@ -33,7 +33,7 @@ JNIEXPORT SWT_PTR JNICALL SWT_AWT_NATIVE(getAWTHandle)
 		 	if ((lock & JAWT_LOCK_ERROR) == 0) {
 			 	dsi = ds->GetDrawingSurfaceInfo(ds);
 				dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
-				result = (SWT_PTR)dsi_win->hwnd;
+				result = (jintLong)dsi_win->hwnd;
 				ds->FreeDrawingSurfaceInfo(dsi);
 				ds->Unlock(ds);
 			}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
index 07b9dce31f..d74e5c9ef9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
@@ -16,17 +16,17 @@
 #define XPCOM_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_XPCOM_##func
 
 #ifndef NO_Call
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(Call)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(Call)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6)
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(Call)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(Call)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6)
 {
 	jbyte *lparg3=NULL;
 	jint *lparg6=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, Call_FUNC);
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((nsWriteSegmentFun)arg0)((nsIInputStream *)arg1, (void *)arg2, (const char *)lparg3, arg4, arg5, (PRUint32 *)lparg6);
+	rc = (jintLong)((nsWriteSegmentFun)arg0)((nsIInputStream *)arg1, (void *)arg2, (const char *)lparg3, arg4, arg5, (PRUint32 *)lparg6);
 fail:
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
@@ -36,43 +36,43 @@ fail:
 #endif
 
 #ifndef NO_NS_1GetComponentManager
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetComponentManager)(JNIEnv *env, jclass that, jintArray arg0);
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetComponentManager)(JNIEnv *env, jclass that, jintLongArray arg0);
 JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetComponentManager)
-	(JNIEnv *env, jclass that, jintArray arg0)
+	(JNIEnv *env, jclass that, jintLongArray arg0)
 {
-	jint *lparg0=NULL;
+	jintLong *lparg0=NULL;
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, NS_1GetComponentManager_FUNC);
-	if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
+	if (arg0) if ((lparg0 = env->GetIntLongArrayElements(arg0, NULL)) == NULL) goto fail;
 	rc = (jint)NS_GetComponentManager((nsIComponentManager**)lparg0);
 fail:
-	if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, 0);
+	if (arg0 && lparg0) env->ReleaseIntLongArrayElements(arg0, lparg0, 0);
 	XPCOM_NATIVE_EXIT(env, that, NS_1GetComponentManager_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NS_1GetServiceManager
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetServiceManager)(JNIEnv *env, jclass that, jintArray arg0);
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetServiceManager)(JNIEnv *env, jclass that, jintLongArray arg0);
 JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetServiceManager)
-	(JNIEnv *env, jclass that, jintArray arg0)
+	(JNIEnv *env, jclass that, jintLongArray arg0)
 {
-	jint *lparg0=NULL;
+	jintLong *lparg0=NULL;
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, NS_1GetServiceManager_FUNC);
-	if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
+	if (arg0) if ((lparg0 = env->GetIntLongArrayElements(arg0, NULL)) == NULL) goto fail;
 	rc = (jint)NS_GetServiceManager((nsIServiceManager**)lparg0);
 fail:
-	if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, 0);
+	if (arg0 && lparg0) env->ReleaseIntLongArrayElements(arg0, lparg0, 0);
 	XPCOM_NATIVE_EXIT(env, that, NS_1GetServiceManager_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NS_1InitXPCOM2
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2);
 JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, NS_1InitXPCOM2_FUNC);
@@ -83,680 +83,1140 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM2)
 #endif
 
 #ifndef NO_NS_1NewLocalFile
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1NewLocalFile)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2);
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1NewLocalFile)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2);
 JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1NewLocalFile)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, NS_1NewLocalFile_FUNC);
-	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)NS_NewLocalFile(*(nsAString *)arg0, arg1, (nsILocalFile**)lparg2);
 fail:
-	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
+	if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0);
 	XPCOM_NATIVE_EXIT(env, that, NS_1NewLocalFile_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO_VtblCall__II) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint))(*(jint **)arg1)[arg0])(arg1);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong))(*(jintLong **)arg1)[arg0])(arg1);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIF
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIF)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIF)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2)
+#if (!defined(NO_VtblCall__IIF) && !defined(JNI64)) || (!defined(NO_VtblCall__IJF) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIF)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIF)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJF)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJF)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIF_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jfloat))(*(jint **)arg1)[arg0])(arg1, arg2);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJF_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jfloat))(*(jintLong **)arg1)[arg0])(arg1, arg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIF_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJF_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_VtblCall__III) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_VtblCall__IIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO_VtblCall__IIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIII_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO_VtblCall__IIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#if (!defined(NO_VtblCall__IIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIII_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#if (!defined(NO_VtblCall__IIIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIIIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIII_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIIIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+#if (!defined(NO_VtblCall__IIIIIIIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIIIIIIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIIIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIIIIIIIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIIIIIII_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIIIIIIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIIIIIIIIIISI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIIIIIISI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16)
+#if (!defined(NO_VtblCall__IIIIIIIIIIIIIIISI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIIIIIIIIIIIISI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIIIIIIIIIISI_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIIIIIIIIIIIISI_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIIIIIIIIIISI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIIIIIIIIIIIISI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIII_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII_3C_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10)
+#if (!defined(NO_VtblCall__IIIIIIII_3C_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIIIII_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10)
+#endif
 {
 	jchar *lparg8=NULL;
 	jint *lparg9=NULL;
 	jint *lparg10=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIIIII_3C_3I_3I_FUNC);
+#endif
 	if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
 	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
 	if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
 fail:
 	if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
 	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
 	if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIII_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIIIII_3C_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIJII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIJII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIJII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8)
+#if (!defined(NO_VtblCall__IIIIIIJII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIIIJII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIJII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jlong, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIIIJII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jlong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIJII_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIIIJII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII_3CIIIII_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3CIIIII_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13)
+#if (!defined(NO_VtblCall__IIIIII_3CIIIII_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIII_3CIIIII_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13)
+#endif
 {
 	jchar *lparg6=NULL;
 	jint *lparg12=NULL;
 	jint *lparg13=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIII_3CIIIII_3I_3I_FUNC);
+#endif
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg12) if ((lparg12 = env->GetIntArrayElements(arg12, NULL)) == NULL) goto fail;
 	if (arg13) if ((lparg13 = env->GetIntArrayElements(arg13, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jint, jint, jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jchar *, jint, jint, jint, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
 fail:
 	if (arg13 && lparg13) env->ReleaseIntArrayElements(arg13, lparg13, 0);
 	if (arg12 && lparg12) env->ReleaseIntArrayElements(arg12, lparg12, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIII_3CIIIII_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII_3C_3BIIIII_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3BIIIII_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14)
+#if (!defined(NO_VtblCall__IIIIII_3C_3BIIIII_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIII_3C_3BIIIII_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14)
+#endif
 {
 	jchar *lparg6=NULL;
 	jbyte *lparg7=NULL;
 	jint *lparg13=NULL;
 	jint *lparg14=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIII_3C_3BIIIII_3I_3I_FUNC);
+#endif
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg13) if ((lparg13 = env->GetIntArrayElements(arg13, NULL)) == NULL) goto fail;
 	if (arg14) if ((lparg14 = env->GetIntArrayElements(arg14, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jbyte *, jint, jint, jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jchar *, jbyte *, jint, jint, jint, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
 fail:
 	if (arg14 && lparg14) env->ReleaseIntArrayElements(arg14, lparg14, 0);
 	if (arg13 && lparg13) env->ReleaseIntArrayElements(arg13, lparg13, 0);
 	if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIII_3C_3BIIIII_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#if (!defined(NO_VtblCall__IIIIII_3C_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIII_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#endif
 {
 	jchar *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIII_3C_3I_3I_FUNC);
+#endif
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
 fail:
 	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIII_3C_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7)
+#if (!defined(NO_VtblCall__IIIIII_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIII_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7)
+#endif
 {
 	jint *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIII_3I_3I_FUNC);
+#endif
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIII_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIII_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5)
+#if (!defined(NO_VtblCall__IIIII_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIII_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5)
+#endif
 {
 	jchar *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIII_3C_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIII_3C_FUNC);
+#endif
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIII_3C_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIII_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIII_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__IIIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIII_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+#endif
 {
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIII_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIII_3I_FUNC);
+#endif
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIII_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIII_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIJJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJJJJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
+#if (!defined(NO_VtblCall__IIIIJJJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIJJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIJJJJ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIJJJJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIJJJJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3B)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
+#if (!defined(NO_VtblCall__IIII_3B) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4)
+#endif
 {
 	jbyte *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3B_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3B_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3B_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3B_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4)
+#if (!defined(NO_VtblCall__IIII_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4)
+#endif
 {
 	jchar *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3C_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3C_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3C_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3CIJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CIJI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
+#if (!defined(NO_VtblCall__IIII_3CIJI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3CIJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
+#endif
 {
 	jchar *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3CIJI_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3CIJI_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *, jint, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *, jint, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3CIJI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3CIJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3CJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CJJJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
+#if (!defined(NO_VtblCall__IIII_3CJJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3CJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
+#endif
 {
 	jchar *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3CJJJ_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3CJJJ_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3CJJJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3CJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3C_3CI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C_3CI_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7)
+#if (!defined(NO_VtblCall__IIII_3C_3CI_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3C_3CI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7)
+#endif
 {
 	jchar *lparg4=NULL;
 	jchar *lparg5=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3C_3CI_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3C_3CI_3I_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *, jchar *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *, jchar *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3C_3CI_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3C_3CI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4)
+#endif
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3I_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlongArray arg4)
+#if (!defined(NO_VtblCall__IIII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4)
+#endif
 {
 	jlong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3J_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIJJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jlong arg4)
+#if (!defined(NO_VtblCall__IIIJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIJJ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIJJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIJJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
+#endif
 {
 	nsID _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, nsID *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, nsID *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4)
+#endif
 {
 	nsID _arg3, *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
+#if (!defined(NO_VtblCall__III_3B) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3)
+#endif
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3B_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3B_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4)
+#if (!defined(NO_VtblCall__III_3BI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3BI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
+#endif
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3BI_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3BI_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3BI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3BI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3BI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__III_3BI_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3BI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5)
+#endif
 {
 	jbyte *lparg3=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3BI_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3BI_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3BI_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3BI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3B_3B_3BI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3B_3BI_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7)
+#if (!defined(NO_VtblCall__III_3B_3B_3BI_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3B_3B_3BI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7)
+#endif
 {
 	jbyte *lparg3=NULL;
 	jbyte *lparg4=NULL;
 	jbyte *lparg5=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3B_3BI_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3B_3B_3BI_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jbyte *, jbyte *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jbyte *, jbyte *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3B_3BI_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3B_3B_3BI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3B_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jcharArray arg4)
+#if (!defined(NO_VtblCall__III_3B_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3B_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jcharArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jcharArray arg4)
+#endif
 {
 	jbyte *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3C_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3B_3C_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3C_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3B_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3B_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__III_3B_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3B_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintArray arg4)
+#endif
 {
 	jbyte *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3B_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3B_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3)
+#if (!defined(NO_VtblCall__III_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3)
+#endif
 {
 	jchar *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3CI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3CI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4)
+#if (!defined(NO_VtblCall__III_3CI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3CI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jint arg4)
+#endif
 {
 	jchar *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3CI_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3CI_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3CI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3CI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4)
+#if (!defined(NO_VtblCall__III_3C_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3C_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3C_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
+#if (!defined(NO_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
@@ -767,7 +1227,11 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)
 	jint *lparg10=NULL;
 	jint *lparg11=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
@@ -776,7 +1240,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)
 	if (arg9) if ((lparg9 = env->GetCharArrayElements(arg9, NULL)) == NULL) goto fail;
 	if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
 	if (arg11) if ((lparg11 = env->GetIntArrayElements(arg11, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
 fail:
 	if (arg11 && lparg11) env->ReleaseIntArrayElements(arg11, lparg11, 0);
 	if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
@@ -786,15 +1250,23 @@ fail:
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3CI_3I_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+#if (!defined(NO_VtblCall__III_3C_3CI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3C_3CI_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
@@ -802,54 +1274,78 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3I)
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3CI_3I_3I_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
 fail:
 	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3CI_3I_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3C_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__III_3C_3C_3C_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3C_3C_3C_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jchar *lparg5=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3C_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3C_3C_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
 fail:
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3C_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3C_3C_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+#if (!defined(NO_VtblCall__III_3C_3C_3C_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3C_3C_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
@@ -857,51 +1353,75 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I_3I)
 	jint *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3C_3C_3I_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3C_3C_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__III_3C_3C_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3C_3C_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3C_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3C_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3I_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#if (!defined(NO_VtblCall__III_3C_3C_3I_3C_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3C_3C_3I_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
@@ -910,14 +1430,18 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3I_3I)
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3C_3I_3C_3I_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
 fail:
 	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
@@ -925,15 +1449,23 @@ fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3C_3I_3C_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3C_3C_3I_3I_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
+#if (!defined(NO_VtblCall__III_3C_3C_3I_3I_3C_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
@@ -943,7 +1475,11 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)
 	jint *lparg8=NULL;
 	jint *lparg9=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -951,7 +1487,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)
 	if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
 	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint *, jint *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint *, jint *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
 fail:
 	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
 	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
@@ -960,658 +1496,1110 @@ fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+#if (!defined(NO_VtblCall__III_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3)
+#endif
 {
 	jint *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3I_3I_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I_3I_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__III_3I_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3I_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
+#endif
 {
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3I_3I_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3I_3I_3I_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
 fail:
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3I_3I_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3I_3I_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2)
+#if (!defined(NO_VtblCall__IIJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong))(*(jint **)arg1)[arg0])(arg1, arg2);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3)
+#if (!defined(NO_VtblCall__IIJI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJI_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJI_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJIIJIIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+#if (!defined(NO_VtblCall__IIJIIJIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJIIJIIIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJIIJIIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJIIJIIIIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJIIJIIIIII_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJIIJIIIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJIIJIIIIIIIIISJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIIIIIISJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16)
+#if (!defined(NO_VtblCall__IIJIIJIIIIIIIIISJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJIIJIIIIIIIIISJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJIIJIIIIIIIIISJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJIIJIIIIIIIIISJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJIIJ_3I_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJ_3I_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7)
+#if (!defined(NO_VtblCall__IIJIIJ_3I_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJIIJ_3I_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7)
+#endif
 {
 	jint *lparg6=NULL;
 	jlong *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJIIJ_3I_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJIIJ_3I_3J_FUNC);
+#endif
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJIIJ_3I_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJIIJ_3I_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJI_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlongArray arg4)
+#if (!defined(NO_VtblCall__IIJI_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJI_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4)
+#endif
 {
 	jlong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJI_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJI_3J_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJI_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJI_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3)
+#if (!defined(NO_VtblCall__IIJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4)
+#if (!defined(NO_VtblCall__IIJJI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJI_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJI_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5)
+#if (!defined(NO_VtblCall__IIJJII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJII_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#if (!defined(NO_VtblCall__IIJJIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJIIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJIIII_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJIJ_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIJ_3C_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#if (!defined(NO_VtblCall__IIJJIJ_3C_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJIJ_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#endif
 {
 	jchar *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJIJ_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJIJ_3C_3I_3I_FUNC);
+#endif
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jlong, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jlong, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
 fail:
 	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJIJ_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJIJ_3C_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJI_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5)
+#if (!defined(NO_VtblCall__IIJJI_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJI_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5)
+#endif
 {
 	jchar *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJI_3C_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJI_3C_FUNC);
+#endif
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJI_3C_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJI_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__IIJJI_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5)
+#endif
 {
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJI_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJI_3I_FUNC);
+#endif
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJI_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4)
+#if (!defined(NO_VtblCall__IIJJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5)
+#if (!defined(NO_VtblCall__IIJJJI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJI_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJI_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJI_3CJJIJI_3J_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3CJJIJI_3J_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13)
+#if (!defined(NO_VtblCall__IIJJJI_3CJJIJI_3J_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJJI_3CJJIJI_3J_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13)
+#endif
 {
 	jchar *lparg6=NULL;
 	jlong *lparg12=NULL;
 	jlong *lparg13=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJI_3CJJIJI_3J_3J_FUNC);
+#endif
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg12) if ((lparg12 = env->GetLongArrayElements(arg12, NULL)) == NULL) goto fail;
 	if (arg13) if ((lparg13 = env->GetLongArrayElements(arg13, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint, jchar *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jint, jchar *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
 fail:
 	if (arg13 && lparg13) env->ReleaseLongArrayElements(arg13, lparg13, 0);
 	if (arg12 && lparg12) env->ReleaseLongArrayElements(arg12, lparg12, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJI_3CJJIJI_3J_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14)
+#if (!defined(NO_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJJI_3C_3BJJIJI_3J_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14)
+#endif
 {
 	jchar *lparg6=NULL;
 	jbyte *lparg7=NULL;
 	jlong *lparg13=NULL;
 	jlong *lparg14=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJI_3C_3BJJIJI_3J_3J_FUNC);
+#endif
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg13) if ((lparg13 = env->GetLongArrayElements(arg13, NULL)) == NULL) goto fail;
 	if (arg14) if ((lparg14 = env->GetLongArrayElements(arg14, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint, jchar *, jbyte *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jint, jchar *, jbyte *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
 fail:
 	if (arg14 && lparg14) env->ReleaseLongArrayElements(arg14, lparg14, 0);
 	if (arg13 && lparg13) env->ReleaseLongArrayElements(arg13, lparg13, 0);
 	if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJI_3C_3BJJIJI_3J_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJJIJ_3C_3I_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJIJ_3C_3I_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10)
+#if (!defined(NO_VtblCall__IIJJJJIJ_3C_3I_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJJJIJ_3C_3I_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10)
+#endif
 {
 	jchar *lparg8=NULL;
 	jint *lparg9=NULL;
 	jlong *lparg10=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJJIJ_3C_3I_3J_FUNC);
+#endif
 	if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
 	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
 	if (arg10) if ((lparg10 = env->GetLongArrayElements(arg10, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jint, jlong, jchar *, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jint, jlong, jchar *, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
 fail:
 	if (arg10 && lparg10) env->ReleaseLongArrayElements(arg10, lparg10, 0);
 	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
 	if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJJIJ_3C_3I_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
+#if (!defined(NO_VtblCall__IIJJJJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJJ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJJJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
+#if (!defined(NO_VtblCall__IIJJJJJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJJJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJJJ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJJJJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJJJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJJJJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
+#if (!defined(NO_VtblCall__IIJJJJJJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJJJJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJJJJ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJJJJJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJJJJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJ_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3B)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4)
+#if (!defined(NO_VtblCall__IIJJ_3B) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJ_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4)
+#endif
 {
 	jbyte *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3B_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJ_3B_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3B_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJ_3B_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJ_3CIJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CIJI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
+#if (!defined(NO_VtblCall__IIJJ_3CIJI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJ_3CIJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
+#endif
 {
 	jchar *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3CIJI_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJ_3CIJI_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jchar *, jint, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jchar *, jint, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3CIJI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJ_3CIJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJ_3CJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CJJJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
+#if (!defined(NO_VtblCall__IIJJ_3CJJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJ_3CJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
+#endif
 {
 	jchar *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3CJJJ_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJ_3CJJJ_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jchar *, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jchar *, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3CJJJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJ_3CJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJ_3C_3CI_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3C_3CI_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7)
+#if (!defined(NO_VtblCall__IIJJ_3C_3CI_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJ_3C_3CI_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7)
+#endif
 {
 	jchar *lparg4=NULL;
 	jchar *lparg5=NULL;
 	jlong *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3C_3CI_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJ_3C_3CI_3J_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jchar *, jchar *, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jchar *, jchar *, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3C_3CI_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJ_3C_3CI_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJ_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIJJ_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJ_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4)
+#endif
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJ_3I_FUNC);
+#endif
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJ_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3)
+#if (!defined(NO_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3)
+#endif
 {
 	nsID _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, nsID *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, nsID *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3, jlongArray arg4)
+#if (!defined(NO_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4)
+#endif
 {
 	nsID _arg3, *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3)
+#if (!defined(NO_VtblCall__IIJ_3B) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3)
+#endif
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3B_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3B_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3B_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3B_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jint arg4)
+#if (!defined(NO_VtblCall__IIJ_3BI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3BI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jint arg4)
+#endif
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3BI_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3BI_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3BI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3BI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3BJ_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BJ_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5)
+#if (!defined(NO_VtblCall__IIJ_3BJ_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3BJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5)
+#endif
 {
 	jbyte *lparg3=NULL;
 	jlong *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3BJ_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3BJ_3J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3BJ_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3BJ_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3B_3B_3BJ_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3B_3BJ_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
+#if (!defined(NO_VtblCall__IIJ_3B_3B_3BJ_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3B_3B_3BJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
+#endif
 {
 	jbyte *lparg3=NULL;
 	jbyte *lparg4=NULL;
 	jbyte *lparg5=NULL;
 	jlong *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3B_3B_3BJ_3J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jbyte *, jbyte *, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jbyte *, jbyte *, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
 	if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3B_3B_3BJ_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3B_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jcharArray arg4)
+#if (!defined(NO_VtblCall__IIJ_3B_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3B_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4)
+#endif
 {
 	jbyte *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3B_3C_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3B_3C_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3B_3C_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3B_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3CI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3CI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jint arg4)
+#if (!defined(NO_VtblCall__IIJ_3CI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3CI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jint arg4)
+#endif
 {
 	jchar *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3CI_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3CI_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3CI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3CI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4)
+#if (!defined(NO_VtblCall__IIJ_3C_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3C_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
+#if (!defined(NO_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
@@ -1622,7 +2610,11 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)
 	jint *lparg10=NULL;
 	jint *lparg11=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
@@ -1631,7 +2623,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)
 	if (arg9) if ((lparg9 = env->GetCharArrayElements(arg9, NULL)) == NULL) goto fail;
 	if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
 	if (arg11) if ((lparg11 = env->GetIntArrayElements(arg11, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
 fail:
 	if (arg11 && lparg11) env->ReleaseIntArrayElements(arg11, lparg11, 0);
 	if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
@@ -1641,15 +2633,23 @@ fail:
 	if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3CI_3J_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3J_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8)
+#if (!defined(NO_VtblCall__IIJ_3C_3CI_3J_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3C_3CI_3J_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
@@ -1657,54 +2657,78 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3J_3I_3I)
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3CI_3J_3I_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jint, jlong *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jint, jlong *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
 fail:
 	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3CI_3J_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C_3C_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__IIJ_3C_3C_3C_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3C_3C_3C_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jchar *lparg5=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3C_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_3C_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
 fail:
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3C_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_3C_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+#if (!defined(NO_VtblCall__IIJ_3C_3C_3C_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3C_3C_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
@@ -1712,74 +2736,110 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I_3I)
 	jint *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_3C_3I_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_3C_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__IIJ_3C_3C_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3C_3C_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5)
+#if (!defined(NO_VtblCall__IIJ_3C_3C_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3C_3C_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jlong *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_3J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C_3J_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3C_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#if (!defined(NO_VtblCall__IIJ_3C_3C_3J_3C_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3C_3C_3J_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
@@ -1788,14 +2848,18 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3C_3I_3I)
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_3J_3C_3I_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jlong *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jlong *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
 fail:
 	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
@@ -1803,15 +2867,23 @@ fail:
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_3J_3C_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
+#if (!defined(NO_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
+#endif
 {
 	jchar *lparg3=NULL;
 	jchar *lparg4=NULL;
@@ -1821,7 +2893,11 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)
 	jint *lparg8=NULL;
 	jint *lparg9=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -1829,7 +2905,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)
 	if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
 	if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jlong *, jlong *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jlong *, jlong *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
 fail:
 	if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
 	if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
@@ -1838,198 +2914,314 @@ fail:
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jintArray arg3)
+#if (!defined(NO_VtblCall__IIJ_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3)
+#endif
 {
 	jint *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlongArray arg3)
+#if (!defined(NO_VtblCall__IIJ_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3)
+#endif
 {
 	jlong *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3)
+#endif
 {
 	nsID _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5)
+#endif
 {
 	nsID _arg2, *lparg2=NULL;
 	nsID _arg4, *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jint, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3)
+#endif
 {
 	nsID _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5)
+#endif
 {
 	nsID _arg2, *lparg2=NULL;
 	nsID _arg4, *lparg4=NULL;
 	jlong *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jlong, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jlong, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4)
+#endif
 {
 	nsID _arg2, *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jlongArray arg4)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4)
+#endif
 {
 	nsID _arg2, *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5)
+#endif
 {
 	nsID _arg2, *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jbyte *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jbyte *, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
 fail:
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7)
+#endif
 {
 	nsID _arg2, *lparg2=NULL;
 	jbyte *lparg3=NULL;
@@ -2037,51 +3229,75 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozill
 	jbyte *lparg6=NULL;
 	jbyte *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jint, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jbyte *, jbyte *, jint, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5)
+#endif
 {
 	nsID _arg2, *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jbyte *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jbyte *, jbyte *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
 fail:
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7)
+#endif
 {
 	nsID _arg2, *lparg2=NULL;
 	jbyte *lparg3=NULL;
@@ -2089,939 +3305,1475 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozill
 	jbyte *lparg6=NULL;
 	jbyte *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jlong, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jbyte *, jbyte *, jlong, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
 	if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3)
+#endif
 {
 	nsID _arg2, *lparg2=NULL;
 	jint *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlongArray arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3)
+#endif
 {
 	nsID _arg2, *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2)
+#if (!defined(NO_VtblCall__II_3B) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+#if (!defined(NO_VtblCall__II_3BI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BI_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BII_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BII_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__II_3BII_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BII_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jint *lparg5=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BII_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BII_3I_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
 fail:
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BII_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BII_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BIJ_3J_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BIJ_3J_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__II_3BIJ_3J_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BIJ_3J_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jlong *lparg5=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BIJ_3J_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BIJ_3J_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jlong, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jlong, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
 fail:
 	if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BIJ_3J_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BIJ_3J_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5)
+#endif
 {
 	jbyte *lparg2=NULL;
 	nsID _arg4, *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__II_3BI_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BI_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BI_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__II_3BI_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BI_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BI_3I_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BI_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BI_3J_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3J_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__II_3BI_3J_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BI_3J_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jlong *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_3J_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BI_3J_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_3J_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BI_3J_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3)
+#if (!defined(NO_VtblCall__II_3BJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BJ_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5)
+#if (!defined(NO_VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5)
+#endif
 {
 	jbyte *lparg2=NULL;
 	nsID _arg4, *lparg4=NULL;
 	jlong *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jint arg4)
+#if (!defined(NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jint arg4)
+#endif
 {
 	jbyte *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, nsID *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlong arg4)
+#if (!defined(NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlong arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlong arg4)
+#endif
 {
 	jbyte *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, nsID *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
+#endif
 {
 	jbyte *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlongArray arg4)
+#if (!defined(NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4)
+#endif
 {
 	jbyte *lparg2=NULL;
 	nsID _arg3, *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3)
+#if (!defined(NO_VtblCall__II_3B_3B) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3B_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3B_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
+#if (!defined(NO_VtblCall__II_3B_3BI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3BI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3BI_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3BI_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3BI_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3BI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3B_3BII_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7)
+#if (!defined(NO_VtblCall__II_3B_3B_3BII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3B_3BII_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jbyte *lparg4=NULL;
 	jint *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3BII_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3B_3BII_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jbyte *, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jbyte *, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3BII_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3B_3BII_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3B_3BII_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7)
+#if (!defined(NO_VtblCall__II_3B_3B_3BII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3B_3BII_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jbyte *lparg4=NULL;
 	jlong *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3BII_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3B_3BII_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jbyte *, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jbyte *, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
 fail:
 	if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
 	if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3BII_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3B_3BII_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3B_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__II_3B_3B_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3B_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3B_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3B_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3B_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4)
+#if (!defined(NO_VtblCall__II_3B_3B_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3B_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3B_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3B_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3)
+#if (!defined(NO_VtblCall__II_3B_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jint *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__II_3B_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3I_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3I_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4)
+#if (!defined(NO_VtblCall__II_3B_3I_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3I_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jint *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3I_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3I_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3)
+#if (!defined(NO_VtblCall__II_3B_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3J_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__II_3B_3J_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3J_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4)
+#endif
 {
 	jbyte *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3J_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3J_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3J_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3J_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2)
+#if (!defined(NO_VtblCall__II_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3C_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3C_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3C_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#if (!defined(NO_VtblCall__II_3CIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CIIII_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIIII_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
 fail:
 	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CIIII_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CIJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIJJJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
+#if (!defined(NO_VtblCall__II_3CIJJJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CIJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CIJJJ_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIJJJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
 fail:
 	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CIJJJ_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CI_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__II_3CI_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CI_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3CI_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CI_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3CI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CJ_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jlong arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CJ_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jlong arg3, jlongArray arg4)
+#if (!defined(NO_VtblCall__II_3CJ_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jlongArray arg4)
+#endif
 {
 	jchar *lparg2=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CJ_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3CJ_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CJ_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3CJ_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3C_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3)
+#if (!defined(NO_VtblCall__II_3C_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3C_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3)
+#endif
 {
 	jchar *lparg2=NULL;
 	jchar *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3C_3C_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3C_3C_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3C_3C_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3C_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3F
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3F)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloatArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3F)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloatArray arg2)
+#if (!defined(NO_VtblCall__II_3F) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3F) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3F)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloatArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3F)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloatArray arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3F)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloatArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3F)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloatArray arg2)
+#endif
 {
 	jfloat *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3F_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3F_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetFloatArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jfloat *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jfloat *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseFloatArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3F_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3F_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+#if (!defined(NO_VtblCall__II_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2)
+#endif
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
+#if (!defined(NO_VtblCall__II_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3)
+#endif
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__II_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+#endif
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3I_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I_3I_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__II_3I_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3I_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#endif
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3I_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3I_3I_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3I_3I_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3I_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3)
+#if (!defined(NO_VtblCall__II_3I_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3I_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3)
+#endif
 {
 	jint *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I_3J_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__II_3I_3J_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3I_3J_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jintArray arg4)
+#endif
 {
 	jint *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3J_3I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3J_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3J_3I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3J_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I_3J_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jlongArray arg4)
+#if (!defined(NO_VtblCall__II_3I_3J_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3I_3J_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4)
+#endif
 {
 	jint *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3J_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3J_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3J_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3J_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2)
+#if (!defined(NO_VtblCall__II_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2)
+#endif
 {
 	jlong *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3J_3J_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J_3J_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
+#if (!defined(NO_VtblCall__II_3J_3J_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3J_3J_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
+#endif
 {
 	jlong *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jlong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3J_3J_3J_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3J_3J_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong *, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
 	if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
 	if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3J_3J_3J_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3J_3J_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3S
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3S)(JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3S)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2)
+#if (!defined(NO_VtblCall__II_3S) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3S) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2)
+#endif
 {
 	jshort *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3S_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3S_FUNC);
+#endif
 	if (arg2) if ((lparg2 = env->GetShortArrayElements(arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jshort *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) env->ReleaseShortArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3S_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3S_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -3056,40 +4808,64 @@ fail:
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2);
-JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	nsID _arg1, *lparg1=NULL;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getnsIDFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
 	if (arg1 && lparg1) setnsIDFields(env, arg1, lparg1);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2);
-JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2);
+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2);
+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	nsID _arg0, *lparg0=NULL;
+#ifndef JNI64
 	XPCOM_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC);
+#else
+	XPCOM_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getnsIDFields(env, arg0, &_arg0)) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setnsIDFields(env, arg0, lparg0);
+#ifndef JNI64
 	XPCOM_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC);
+#else
+	XPCOM_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO_nsEmbedCString_1Length
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1Length)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1Length)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1Length)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1Length_FUNC);
@@ -3100,9 +4876,9 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1Length)
 #endif
 
 #ifndef NO_nsEmbedCString_1delete
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedCString_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedCString_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedCString_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1delete_FUNC);
 	delete (nsEmbedCString *)arg0;
@@ -3111,54 +4887,54 @@ JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedCString_1delete)
 #endif
 
 #ifndef NO_nsEmbedCString_1get
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1get)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1get)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedCString_1get)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedCString_1get)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1get_FUNC);
-	rc = (jint)((nsEmbedCString *)arg0)->get();
+	rc = (jintLong)((nsEmbedCString *)arg0)->get();
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1get_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_nsEmbedCString_1new__
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___FUNC);
-	rc = (jint)new nsEmbedCString();
+	rc = (jintLong)new nsEmbedCString();
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_nsEmbedCString_1new__II
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__II)
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedCString_1new__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedCString_1new__II)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new__II_FUNC);
-	rc = (jint)new nsEmbedCString((const char *)arg0, arg1);
+	rc = (jintLong)new nsEmbedCString((const char *)arg0, arg1);
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new__II_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_nsEmbedCString_1new___3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new___3BI)(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new___3BI)
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedCString_1new___3BI)(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedCString_1new___3BI)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___3BI_FUNC);
 	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)new nsEmbedCString((const char *)lparg0, arg1);
+	rc = (jintLong)new nsEmbedCString((const char *)lparg0, arg1);
 fail:
 	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___3BI_FUNC);
@@ -3167,9 +4943,9 @@ fail:
 #endif
 
 #ifndef NO_nsEmbedString_1Length
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1Length)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1Length)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1Length)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1Length_FUNC);
@@ -3180,9 +4956,9 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1Length)
 #endif
 
 #ifndef NO_nsEmbedString_1delete
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedString_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedString_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedString_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1delete_FUNC);
 	delete (nsEmbedString *)arg0;
@@ -3191,41 +4967,41 @@ JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedString_1delete)
 #endif
 
 #ifndef NO_nsEmbedString_1get
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1get)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1get)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedString_1get)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedString_1get)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1get_FUNC);
-	rc = (jint)((nsEmbedString *)arg0)->get();
+	rc = (jintLong)((nsEmbedString *)arg0)->get();
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1get_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_nsEmbedString_1new__
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new__)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new__)
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedString_1new__)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedString_1new__)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___FUNC);
-	rc = (jint)new nsEmbedString();
+	rc = (jintLong)new nsEmbedString();
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_nsEmbedString_1new___3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new___3C)(JNIEnv *env, jclass that, jcharArray arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new___3C)
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedString_1new___3C)(JNIEnv *env, jclass that, jcharArray arg0);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsEmbedString_1new___3C)
 	(JNIEnv *env, jclass that, jcharArray arg0)
 {
 	jchar *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___3C_FUNC);
 	if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)new nsEmbedString((PRUnichar *)lparg0);
+	rc = (jintLong)new nsEmbedString((PRUnichar *)lparg0);
 fail:
 	if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
 	XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___3C_FUNC);
@@ -3234,9 +5010,9 @@ fail:
 #endif
 
 #ifndef NO_nsID_1Equals
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1Equals)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1Equals)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1Equals)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsID_1Equals_FUNC);
@@ -3247,9 +5023,9 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1Equals)
 #endif
 
 #ifndef NO_nsID_1delete
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	XPCOM_NATIVE_ENTER(env, that, nsID_1delete_FUNC);
 	delete (nsID *)arg0;
@@ -3258,13 +5034,13 @@ JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)
 #endif
 
 #ifndef NO_nsID_1new
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1new)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1new)
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsID_1new)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(nsID_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	XPCOM_NATIVE_ENTER(env, that, nsID_1new_FUNC);
-	rc = (jint)new nsID();
+	rc = (jintLong)new nsID();
 	XPCOM_NATIVE_EXIT(env, that, nsID_1new_FUNC);
 	return rc;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
index cf6de2ca5a..09ef38d3a5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp
@@ -19,7 +19,7 @@ extern "C" {
 
 #ifndef NO_strlen_1PRUnichar
 JNIEXPORT jint JNICALL XPCOM_NATIVE(strlen_1PRUnichar)
-	(JNIEnv *env, jclass that, SWT_PTR arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc;
 	XPCOM_NATIVE_ENTER(env, that, strlen_1PRUnichar_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
index b276290c48..c07323667b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
@@ -22,156 +22,748 @@ char * XPCOM_nativeFunctionNames[] = {
 	"NS_1GetServiceManager",
 	"NS_1InitXPCOM2",
 	"NS_1NewLocalFile",
+#ifndef JNI64
 	"VtblCall__II",
+#else
+	"VtblCall__IJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIF",
+#else
+	"VtblCall__IJF",
+#endif
+#ifndef JNI64
 	"VtblCall__III",
+#else
+	"VtblCall__IJI",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII",
+#else
+	"VtblCall__IJII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIII",
+#else
+	"VtblCall__IJIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIII",
+#else
+	"VtblCall__IJIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIIII",
+#else
+	"VtblCall__IJIIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIIIII",
+#else
+	"VtblCall__IJIIIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIIIIIIIII",
+#else
+	"VtblCall__IJIIIIIIIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIIIIIIIIIIIISI",
+#else
+	"VtblCall__IJIIIIIIIIIIIIISI",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIIIII_3C_3I_3I",
+#else
+	"VtblCall__IJIIIIII_3C_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIIIJII",
+#else
+	"VtblCall__IJIIIIJII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIII_3CIIIII_3I_3I",
+#else
+	"VtblCall__IJIIII_3CIIIII_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIII_3C_3BIIIII_3I_3I",
+#else
+	"VtblCall__IJIIII_3C_3BIIIII_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIII_3C_3I_3I",
+#else
+	"VtblCall__IJIIII_3C_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIII_3I_3I",
+#else
+	"VtblCall__IJIIII_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIII_3C",
+#else
+	"VtblCall__IJIII_3C",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIII_3I",
+#else
+	"VtblCall__IJIII_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIJJJJ",
+#else
+	"VtblCall__IJIIJJJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII_3B",
+#else
+	"VtblCall__IJII_3B",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII_3C",
+#else
+	"VtblCall__IJII_3C",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII_3CIJI",
+#else
+	"VtblCall__IJII_3CIJI",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII_3CJJJ",
+#else
+	"VtblCall__IJII_3CJJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII_3C_3CI_3I",
+#else
+	"VtblCall__IJII_3C_3CI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII_3I",
+#else
+	"VtblCall__IJII_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII_3J",
+#else
+	"VtblCall__IJII_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIJJ",
+#else
+	"VtblCall__IJIJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2",
+#else
+	"VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#else
+	"VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3B",
+#else
+	"VtblCall__IJI_3B",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3BI",
+#else
+	"VtblCall__IJI_3BI",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3BI_3I",
+#else
+	"VtblCall__IJI_3BI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3B_3B_3BI_3I",
+#else
+	"VtblCall__IJI_3B_3B_3BI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3B_3C",
+#else
+	"VtblCall__IJI_3B_3C",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3B_3I",
+#else
+	"VtblCall__IJI_3B_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3C",
+#else
+	"VtblCall__IJI_3C",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3CI",
+#else
+	"VtblCall__IJI_3CI",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3C_3C",
+#else
+	"VtblCall__IJI_3C_3C",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I",
+#else
+	"VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3C_3CI_3I_3I_3I",
+#else
+	"VtblCall__IJI_3C_3CI_3I_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3C_3C_3C_3I",
+#else
+	"VtblCall__IJI_3C_3C_3C_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3C_3C_3C_3I_3I",
+#else
+	"VtblCall__IJI_3C_3C_3C_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3C_3C_3I",
+#else
+	"VtblCall__IJI_3C_3C_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3C_3C_3I_3C_3I_3I",
+#else
+	"VtblCall__IJI_3C_3C_3I_3C_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3C_3C_3I_3I_3C_3I_3I",
+#else
+	"VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3I",
+#else
+	"VtblCall__IJI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3I_3I_3I_3I",
+#else
+	"VtblCall__IJI_3I_3I_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ",
+#else
+	"VtblCall__IJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJI",
+#else
+	"VtblCall__IJJI",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJIIJIIIIII",
+#else
+	"VtblCall__IJJIIJIIIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJIIJIIIIIIIIISJ",
+#else
+	"VtblCall__IJJIIJIIIIIIIIISJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJIIJ_3I_3J",
+#else
+	"VtblCall__IJJIIJ_3I_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJI_3J",
+#else
+	"VtblCall__IJJI_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJ",
+#else
+	"VtblCall__IJJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJI",
+#else
+	"VtblCall__IJJJI",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJII",
+#else
+	"VtblCall__IJJJII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJIIII",
+#else
+	"VtblCall__IJJJIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJIJ_3C_3I_3I",
+#else
+	"VtblCall__IJJJIJ_3C_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJI_3C",
+#else
+	"VtblCall__IJJJI_3C",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJI_3I",
+#else
+	"VtblCall__IJJJI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJJ",
+#else
+	"VtblCall__IJJJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJJI",
+#else
+	"VtblCall__IJJJJI",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJJI_3CJJIJI_3J_3J",
+#else
+	"VtblCall__IJJJJI_3CJJIJI_3J_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJJI_3C_3BJJIJI_3J_3J",
+#else
+	"VtblCall__IJJJJI_3C_3BJJIJI_3J_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJJJIJ_3C_3I_3J",
+#else
+	"VtblCall__IJJJJJIJ_3C_3I_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJJJJ",
+#else
+	"VtblCall__IJJJJJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJJJJJ",
+#else
+	"VtblCall__IJJJJJJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJJJJJJ",
+#else
+	"VtblCall__IJJJJJJJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJ_3B",
+#else
+	"VtblCall__IJJJ_3B",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJ_3CIJI",
+#else
+	"VtblCall__IJJJ_3CIJI",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJ_3CJJJ",
+#else
+	"VtblCall__IJJJ_3CJJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJ_3C_3CI_3J",
+#else
+	"VtblCall__IJJJ_3C_3CI_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJ_3I",
+#else
+	"VtblCall__IJJJ_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2",
+#else
+	"VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#else
+	"VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3B",
+#else
+	"VtblCall__IJJ_3B",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3BI",
+#else
+	"VtblCall__IJJ_3BI",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3BJ_3J",
+#else
+	"VtblCall__IJJ_3BJ_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3B_3B_3BJ_3J",
+#else
+	"VtblCall__IJJ_3B_3B_3BJ_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3B_3C",
+#else
+	"VtblCall__IJJ_3B_3C",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3CI",
+#else
+	"VtblCall__IJJ_3CI",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3C_3C",
+#else
+	"VtblCall__IJJ_3C_3C",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I",
+#else
+	"VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3C_3CI_3J_3I_3I",
+#else
+	"VtblCall__IJJ_3C_3CI_3J_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3C_3C_3C_3I",
+#else
+	"VtblCall__IJJ_3C_3C_3C_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3C_3C_3C_3I_3I",
+#else
+	"VtblCall__IJJ_3C_3C_3C_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3C_3C_3I",
+#else
+	"VtblCall__IJJ_3C_3C_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3C_3C_3J",
+#else
+	"VtblCall__IJJ_3C_3C_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3C_3C_3J_3C_3I_3I",
+#else
+	"VtblCall__IJJ_3C_3C_3J_3C_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I",
+#else
+	"VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3I",
+#else
+	"VtblCall__IJJ_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3J",
+#else
+	"VtblCall__IJJ_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B",
+#else
+	"VtblCall__IJ_3B",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BI",
+#else
+	"VtblCall__IJ_3BI",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BII_3I_3I",
+#else
+	"VtblCall__IJ_3BII_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BIJ_3J_3I",
+#else
+	"VtblCall__IJ_3BIJ_3J_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#else
+	"VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BI_3I",
+#else
+	"VtblCall__IJ_3BI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BI_3I_3I",
+#else
+	"VtblCall__IJ_3BI_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BI_3J_3I",
+#else
+	"VtblCall__IJ_3BI_3J_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BJ",
+#else
+	"VtblCall__IJ_3BJ",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#else
+	"VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I",
+#else
+	"VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J",
+#else
+	"VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#else
+	"VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#else
+	"VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B_3B",
+#else
+	"VtblCall__IJ_3B_3B",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B_3BI",
+#else
+	"VtblCall__IJ_3B_3BI",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B_3B_3BII_3I",
+#else
+	"VtblCall__IJ_3B_3B_3BII_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B_3B_3BII_3J",
+#else
+	"VtblCall__IJ_3B_3B_3BII_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B_3B_3I",
+#else
+	"VtblCall__IJ_3B_3B_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B_3B_3J",
+#else
+	"VtblCall__IJ_3B_3B_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B_3I",
+#else
+	"VtblCall__IJ_3B_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B_3I_3I",
+#else
+	"VtblCall__IJ_3B_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B_3I_3J",
+#else
+	"VtblCall__IJ_3B_3I_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B_3J",
+#else
+	"VtblCall__IJ_3B_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B_3J_3I",
+#else
+	"VtblCall__IJ_3B_3J_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3C",
+#else
+	"VtblCall__IJ_3C",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CIIII",
+#else
+	"VtblCall__IJ_3CIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CIJJJ",
+#else
+	"VtblCall__IJ_3CIJJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CI_3I",
+#else
+	"VtblCall__IJ_3CI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CJ_3J",
+#else
+	"VtblCall__IJ_3CJ_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3C_3C",
+#else
+	"VtblCall__IJ_3C_3C",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3F",
+#else
+	"VtblCall__IJ_3F",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3I",
+#else
+	"VtblCall__IJ_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3I_3I",
+#else
+	"VtblCall__IJ_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3I_3I_3I",
+#else
+	"VtblCall__IJ_3I_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3I_3I_3I_3I",
+#else
+	"VtblCall__IJ_3I_3I_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3I_3J",
+#else
+	"VtblCall__IJ_3I_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3I_3J_3I",
+#else
+	"VtblCall__IJ_3I_3J_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3I_3J_3J",
+#else
+	"VtblCall__IJ_3I_3J_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3J",
+#else
+	"VtblCall__IJ_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3J_3J_3J",
+#else
+	"VtblCall__IJ_3J_3J_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3S",
+#else
+	"VtblCall__IJ_3S",
+#endif
 	"XPCOMGlueShutdown",
 	"XPCOMGlueStartup",
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI",
+#endif
 	"nsEmbedCString_1Length",
 	"nsEmbedCString_1delete",
 	"nsEmbedCString_1get",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
index 11990c6ae7..4fe4afa3b0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
@@ -30,156 +30,748 @@ typedef enum {
 	NS_1GetServiceManager_FUNC,
 	NS_1InitXPCOM2_FUNC,
 	NS_1NewLocalFile_FUNC,
+#ifndef JNI64
 	VtblCall__II_FUNC,
+#else
+	VtblCall__IJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIF_FUNC,
+#else
+	VtblCall__IJF_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_FUNC,
+#else
+	VtblCall__IJI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_FUNC,
+#else
+	VtblCall__IJII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIII_FUNC,
+#else
+	VtblCall__IJIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIII_FUNC,
+#else
+	VtblCall__IJIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIIII_FUNC,
+#else
+	VtblCall__IJIIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIIIII_FUNC,
+#else
+	VtblCall__IJIIIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIIIIIIIII_FUNC,
+#else
+	VtblCall__IJIIIIIIIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIIIIIIIIIIIISI_FUNC,
+#else
+	VtblCall__IJIIIIIIIIIIIIISI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIIIII_3C_3I_3I_FUNC,
+#else
+	VtblCall__IJIIIIII_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIIIJII_FUNC,
+#else
+	VtblCall__IJIIIIJII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIII_3CIIIII_3I_3I_FUNC,
+#else
+	VtblCall__IJIIII_3CIIIII_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC,
+#else
+	VtblCall__IJIIII_3C_3BIIIII_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIII_3C_3I_3I_FUNC,
+#else
+	VtblCall__IJIIII_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIII_3I_3I_FUNC,
+#else
+	VtblCall__IJIIII_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIII_3C_FUNC,
+#else
+	VtblCall__IJIII_3C_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIII_3I_FUNC,
+#else
+	VtblCall__IJIII_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIJJJJ_FUNC,
+#else
+	VtblCall__IJIIJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_3B_FUNC,
+#else
+	VtblCall__IJII_3B_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_3C_FUNC,
+#else
+	VtblCall__IJII_3C_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_3CIJI_FUNC,
+#else
+	VtblCall__IJII_3CIJI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_3CJJJ_FUNC,
+#else
+	VtblCall__IJII_3CJJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_3C_3CI_3I_FUNC,
+#else
+	VtblCall__IJII_3C_3CI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_3I_FUNC,
+#else
+	VtblCall__IJII_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_3J_FUNC,
+#else
+	VtblCall__IJII_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIJJ_FUNC,
+#else
+	VtblCall__IJIJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
+#else
+	VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#else
+	VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3B_FUNC,
+#else
+	VtblCall__IJI_3B_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3BI_FUNC,
+#else
+	VtblCall__IJI_3BI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3BI_3I_FUNC,
+#else
+	VtblCall__IJI_3BI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3B_3B_3BI_3I_FUNC,
+#else
+	VtblCall__IJI_3B_3B_3BI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3B_3C_FUNC,
+#else
+	VtblCall__IJI_3B_3C_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3B_3I_FUNC,
+#else
+	VtblCall__IJI_3B_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3C_FUNC,
+#else
+	VtblCall__IJI_3C_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3CI_FUNC,
+#else
+	VtblCall__IJI_3CI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3C_3C_FUNC,
+#else
+	VtblCall__IJI_3C_3C_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
+#else
+	VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3C_3CI_3I_3I_3I_FUNC,
+#else
+	VtblCall__IJI_3C_3CI_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3C_3C_3C_3I_FUNC,
+#else
+	VtblCall__IJI_3C_3C_3C_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3C_3C_3C_3I_3I_FUNC,
+#else
+	VtblCall__IJI_3C_3C_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3C_3C_3I_FUNC,
+#else
+	VtblCall__IJI_3C_3C_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC,
+#else
+	VtblCall__IJI_3C_3C_3I_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC,
+#else
+	VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3I_FUNC,
+#else
+	VtblCall__IJI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3I_3I_3I_3I_FUNC,
+#else
+	VtblCall__IJI_3I_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_FUNC,
+#else
+	VtblCall__IJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJI_FUNC,
+#else
+	VtblCall__IJJI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJIIJIIIIII_FUNC,
+#else
+	VtblCall__IJJIIJIIIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJIIJIIIIIIIIISJ_FUNC,
+#else
+	VtblCall__IJJIIJIIIIIIIIISJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJIIJ_3I_3J_FUNC,
+#else
+	VtblCall__IJJIIJ_3I_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJI_3J_FUNC,
+#else
+	VtblCall__IJJI_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJ_FUNC,
+#else
+	VtblCall__IJJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJI_FUNC,
+#else
+	VtblCall__IJJJI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJII_FUNC,
+#else
+	VtblCall__IJJJII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJIIII_FUNC,
+#else
+	VtblCall__IJJJIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJIJ_3C_3I_3I_FUNC,
+#else
+	VtblCall__IJJJIJ_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJI_3C_FUNC,
+#else
+	VtblCall__IJJJI_3C_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJI_3I_FUNC,
+#else
+	VtblCall__IJJJI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJJ_FUNC,
+#else
+	VtblCall__IJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJJI_FUNC,
+#else
+	VtblCall__IJJJJI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC,
+#else
+	VtblCall__IJJJJI_3CJJIJI_3J_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC,
+#else
+	VtblCall__IJJJJI_3C_3BJJIJI_3J_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJJJIJ_3C_3I_3J_FUNC,
+#else
+	VtblCall__IJJJJJIJ_3C_3I_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJJJJ_FUNC,
+#else
+	VtblCall__IJJJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJJJJJ_FUNC,
+#else
+	VtblCall__IJJJJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJJJJJJ_FUNC,
+#else
+	VtblCall__IJJJJJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJ_3B_FUNC,
+#else
+	VtblCall__IJJJ_3B_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJ_3CIJI_FUNC,
+#else
+	VtblCall__IJJJ_3CIJI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJ_3CJJJ_FUNC,
+#else
+	VtblCall__IJJJ_3CJJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJ_3C_3CI_3J_FUNC,
+#else
+	VtblCall__IJJJ_3C_3CI_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJ_3I_FUNC,
+#else
+	VtblCall__IJJJ_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
+#else
+	VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#else
+	VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3B_FUNC,
+#else
+	VtblCall__IJJ_3B_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3BI_FUNC,
+#else
+	VtblCall__IJJ_3BI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3BJ_3J_FUNC,
+#else
+	VtblCall__IJJ_3BJ_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3B_3B_3BJ_3J_FUNC,
+#else
+	VtblCall__IJJ_3B_3B_3BJ_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3B_3C_FUNC,
+#else
+	VtblCall__IJJ_3B_3C_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3CI_FUNC,
+#else
+	VtblCall__IJJ_3CI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3C_3C_FUNC,
+#else
+	VtblCall__IJJ_3C_3C_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
+#else
+	VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC,
+#else
+	VtblCall__IJJ_3C_3CI_3J_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3C_3C_3C_3I_FUNC,
+#else
+	VtblCall__IJJ_3C_3C_3C_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC,
+#else
+	VtblCall__IJJ_3C_3C_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3C_3C_3I_FUNC,
+#else
+	VtblCall__IJJ_3C_3C_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3C_3C_3J_FUNC,
+#else
+	VtblCall__IJJ_3C_3C_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC,
+#else
+	VtblCall__IJJ_3C_3C_3J_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC,
+#else
+	VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3I_FUNC,
+#else
+	VtblCall__IJJ_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3J_FUNC,
+#else
+	VtblCall__IJJ_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_FUNC,
+#else
+	VtblCall__IJ_3B_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BI_FUNC,
+#else
+	VtblCall__IJ_3BI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BII_3I_3I_FUNC,
+#else
+	VtblCall__IJ_3BII_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BIJ_3J_3I_FUNC,
+#else
+	VtblCall__IJ_3BIJ_3J_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#else
+	VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BI_3I_FUNC,
+#else
+	VtblCall__IJ_3BI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BI_3I_3I_FUNC,
+#else
+	VtblCall__IJ_3BI_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BI_3J_3I_FUNC,
+#else
+	VtblCall__IJ_3BI_3J_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BJ_FUNC,
+#else
+	VtblCall__IJ_3BJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#else
+	VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+#else
+	VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
+#else
+	VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#else
+	VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#else
+	VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_3B_FUNC,
+#else
+	VtblCall__IJ_3B_3B_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_3BI_FUNC,
+#else
+	VtblCall__IJ_3B_3BI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_3B_3BII_3I_FUNC,
+#else
+	VtblCall__IJ_3B_3B_3BII_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_3B_3BII_3J_FUNC,
+#else
+	VtblCall__IJ_3B_3B_3BII_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_3B_3I_FUNC,
+#else
+	VtblCall__IJ_3B_3B_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_3B_3J_FUNC,
+#else
+	VtblCall__IJ_3B_3B_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_3I_FUNC,
+#else
+	VtblCall__IJ_3B_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_3I_3I_FUNC,
+#else
+	VtblCall__IJ_3B_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_3I_3J_FUNC,
+#else
+	VtblCall__IJ_3B_3I_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_3J_FUNC,
+#else
+	VtblCall__IJ_3B_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_3J_3I_FUNC,
+#else
+	VtblCall__IJ_3B_3J_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3C_FUNC,
+#else
+	VtblCall__IJ_3C_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CIIII_FUNC,
+#else
+	VtblCall__IJ_3CIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CIJJJ_FUNC,
+#else
+	VtblCall__IJ_3CIJJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CI_3I_FUNC,
+#else
+	VtblCall__IJ_3CI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CJ_3J_FUNC,
+#else
+	VtblCall__IJ_3CJ_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3C_3C_FUNC,
+#else
+	VtblCall__IJ_3C_3C_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3F_FUNC,
+#else
+	VtblCall__IJ_3F_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3I_FUNC,
+#else
+	VtblCall__IJ_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3I_3I_FUNC,
+#else
+	VtblCall__IJ_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3I_3I_3I_FUNC,
+#else
+	VtblCall__IJ_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3I_3I_3I_3I_FUNC,
+#else
+	VtblCall__IJ_3I_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3I_3J_FUNC,
+#else
+	VtblCall__IJ_3I_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3I_3J_3I_FUNC,
+#else
+	VtblCall__IJ_3I_3J_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3I_3J_3J_FUNC,
+#else
+	VtblCall__IJ_3I_3J_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3J_FUNC,
+#else
+	VtblCall__IJ_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3J_3J_3J_FUNC,
+#else
+	VtblCall__IJ_3J_3J_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3S_FUNC,
+#else
+	VtblCall__IJ_3S_FUNC,
+#endif
 	XPCOMGlueShutdown_FUNC,
 	XPCOMGlueStartup_FUNC,
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI_FUNC,
+#endif
 	nsEmbedCString_1Length_FUNC,
 	nsEmbedCString_1delete_FUNC,
 	nsEmbedCString_1get_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp
index c1afd50c93..99e83f6f3f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.cpp
@@ -29,9 +29,9 @@ JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GREVersionRange_1sizeof)
 #endif
 
 #ifndef NO_GRE_1GetGREPathWithProperties
-extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GRE_1GetGREPathWithProperties)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GRE_1GetGREPathWithProperties)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jintLong arg2, jint arg3, jintLong arg4, jint arg5);
 JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GRE_1GetGREPathWithProperties)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jintLong arg2, jint arg3, jintLong arg4, jint arg5)
 {
 	GREVersionRange _arg0, *lparg0=NULL;
 	jint rc = 0;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.cpp
index b709dc6ee0..e9edfd6f24 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit_structs.cpp
@@ -25,9 +25,9 @@ void cacheGREVersionRangeFields(JNIEnv *env, jobject lpObject)
 {
 	if (GREVersionRangeFc.cached) return;
 	GREVersionRangeFc.clazz = env->GetObjectClass(lpObject);
-	GREVersionRangeFc.lower = env->GetFieldID(GREVersionRangeFc.clazz, "lower", "I");
+	GREVersionRangeFc.lower = env->GetFieldID(GREVersionRangeFc.clazz, "lower", I_J);
 	GREVersionRangeFc.lowerInclusive = env->GetFieldID(GREVersionRangeFc.clazz, "lowerInclusive", "Z");
-	GREVersionRangeFc.upper = env->GetFieldID(GREVersionRangeFc.clazz, "upper", "I");
+	GREVersionRangeFc.upper = env->GetFieldID(GREVersionRangeFc.clazz, "upper", I_J);
 	GREVersionRangeFc.upperInclusive = env->GetFieldID(GREVersionRangeFc.clazz, "upperInclusive", "Z");
 	GREVersionRangeFc.cached = 1;
 }
@@ -35,9 +35,9 @@ void cacheGREVersionRangeFields(JNIEnv *env, jobject lpObject)
 GREVersionRange *getGREVersionRangeFields(JNIEnv *env, jobject lpObject, GREVersionRange *lpStruct)
 {
 	if (!GREVersionRangeFc.cached) cacheGREVersionRangeFields(env, lpObject);
-	lpStruct->lower = (const char *)env->GetIntField(lpObject, GREVersionRangeFc.lower);
+	lpStruct->lower = (const char *)env->GetIntLongField(lpObject, GREVersionRangeFc.lower);
 	lpStruct->lowerInclusive = env->GetBooleanField(lpObject, GREVersionRangeFc.lowerInclusive);
-	lpStruct->upper = (const char *)env->GetIntField(lpObject, GREVersionRangeFc.upper);
+	lpStruct->upper = (const char *)env->GetIntLongField(lpObject, GREVersionRangeFc.upper);
 	lpStruct->upperInclusive = env->GetBooleanField(lpObject, GREVersionRangeFc.upperInclusive);
 	return lpStruct;
 }
@@ -45,9 +45,9 @@ GREVersionRange *getGREVersionRangeFields(JNIEnv *env, jobject lpObject, GREVers
 void setGREVersionRangeFields(JNIEnv *env, jobject lpObject, GREVersionRange *lpStruct)
 {
 	if (!GREVersionRangeFc.cached) cacheGREVersionRangeFields(env, lpObject);
-	env->SetIntField(lpObject, GREVersionRangeFc.lower, (jint)lpStruct->lower);
+	env->SetIntLongField(lpObject, GREVersionRangeFc.lower, (jintLong)lpStruct->lower);
 	env->SetBooleanField(lpObject, GREVersionRangeFc.lowerInclusive, (jboolean)lpStruct->lowerInclusive);
-	env->SetIntField(lpObject, GREVersionRangeFc.upper, (jint)lpStruct->upper);
+	env->SetIntLongField(lpObject, GREVersionRangeFc.upper, (jintLong)lpStruct->upper);
 	env->SetBooleanField(lpObject, GREVersionRangeFc.upperInclusive, (jboolean)lpStruct->upperInclusive);
 }
 #endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c
index cdf2284819..7adc742281 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c
@@ -52,14 +52,14 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glViewport)
 #endif
 
 #ifndef NO__1glXChooseVisual
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXChooseVisual)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXChooseVisual)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXChooseVisual_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)glXChooseVisual((Display *)arg0, arg1, lparg2);
+	rc = (jintLong)glXChooseVisual((Display *)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	GLX_NATIVE_EXIT(env, that, _1glXChooseVisual_FUNC);
@@ -69,7 +69,7 @@ fail:
 
 #ifndef NO__1glXCopyContext
 JNIEXPORT void JNICALL GLX_NATIVE(_1glXCopyContext)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
 	GLX_NATIVE_ENTER(env, that, _1glXCopyContext_FUNC);
 	glXCopyContext((Display *)arg0, (GLXContext)arg1, (GLXContext)arg2, arg3);
@@ -78,14 +78,14 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXCopyContext)
 #endif
 
 #ifndef NO__1glXCreateContext
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXCreateContext)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jboolean arg3)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXCreateContext)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jboolean arg3)
 {
 	XVisualInfo _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXCreateContext_FUNC);
 	if (arg1) if ((lparg1 = getXVisualInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)glXCreateContext((Display *)arg0, lparg1, (GLXContext)arg2, arg3);
+	rc = (jintLong)glXCreateContext((Display *)arg0, lparg1, (GLXContext)arg2, arg3);
 fail:
 	if (arg1 && lparg1) setXVisualInfoFields(env, arg1, lparg1);
 	GLX_NATIVE_EXIT(env, that, _1glXCreateContext_FUNC);
@@ -94,14 +94,14 @@ fail:
 #endif
 
 #ifndef NO__1glXCreateGLXPixmap
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXCreateGLXPixmap)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXCreateGLXPixmap)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
 {
 	XVisualInfo _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXCreateGLXPixmap_FUNC);
 	if (arg1) if ((lparg1 = getXVisualInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)glXCreateGLXPixmap((Display *)arg0, lparg1, (Pixmap)arg2);
+	rc = (jintLong)glXCreateGLXPixmap((Display *)arg0, lparg1, (Pixmap)arg2);
 fail:
 	if (arg1 && lparg1) setXVisualInfoFields(env, arg1, lparg1);
 	GLX_NATIVE_EXIT(env, that, _1glXCreateGLXPixmap_FUNC);
@@ -111,7 +111,7 @@ fail:
 
 #ifndef NO__1glXDestroyContext
 JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyContext)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	GLX_NATIVE_ENTER(env, that, _1glXDestroyContext_FUNC);
 	glXDestroyContext((Display *)arg0, (GLXContext)arg1);
@@ -121,7 +121,7 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyContext)
 
 #ifndef NO__1glXDestroyGLXPixmap
 JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyGLXPixmap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	GLX_NATIVE_ENTER(env, that, _1glXDestroyGLXPixmap_FUNC);
 	glXDestroyGLXPixmap((Display *)arg0, (GLXPixmap)arg1);
@@ -130,12 +130,12 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyGLXPixmap)
 #endif
 
 #ifndef NO__1glXGetClientString
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetClientString)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXGetClientString)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXGetClientString_FUNC);
-	rc = (jint)glXGetClientString((Display *)arg0, arg1);
+	rc = (jintLong)glXGetClientString((Display *)arg0, arg1);
 	GLX_NATIVE_EXIT(env, that, _1glXGetClientString_FUNC);
 	return rc;
 }
@@ -143,7 +143,7 @@ JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetClientString)
 
 #ifndef NO__1glXGetConfig
 JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetConfig)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jintArray arg3)
 {
 	XVisualInfo _arg1, *lparg1=NULL;
 	jint *lparg3=NULL;
@@ -161,24 +161,24 @@ fail:
 #endif
 
 #ifndef NO__1glXGetCurrentContext
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetCurrentContext)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXGetCurrentContext)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXGetCurrentContext_FUNC);
-	rc = (jint)glXGetCurrentContext();
+	rc = (jintLong)glXGetCurrentContext();
 	GLX_NATIVE_EXIT(env, that, _1glXGetCurrentContext_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1glXGetCurrentDrawable
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetCurrentDrawable)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXGetCurrentDrawable)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXGetCurrentDrawable_FUNC);
-	rc = (jint)glXGetCurrentDrawable();
+	rc = (jintLong)glXGetCurrentDrawable();
 	GLX_NATIVE_EXIT(env, that, _1glXGetCurrentDrawable_FUNC);
 	return rc;
 }
@@ -186,7 +186,7 @@ JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetCurrentDrawable)
 
 #ifndef NO__1glXIsDirect
 JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXIsDirect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXIsDirect_FUNC);
@@ -198,7 +198,7 @@ JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXIsDirect)
 
 #ifndef NO__1glXMakeCurrent
 JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXMakeCurrent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXMakeCurrent_FUNC);
@@ -210,7 +210,7 @@ JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXMakeCurrent)
 
 #ifndef NO__1glXQueryExtension
 JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXQueryExtension)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -228,24 +228,24 @@ fail:
 #endif
 
 #ifndef NO__1glXQueryExtensionsString
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXQueryExtensionsString)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXQueryExtensionsString)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXQueryExtensionsString_FUNC);
-	rc = (jint)glXQueryExtensionsString((Display *)arg0, arg1);
+	rc = (jintLong)glXQueryExtensionsString((Display *)arg0, arg1);
 	GLX_NATIVE_EXIT(env, that, _1glXQueryExtensionsString_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1glXQueryServerString
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXQueryServerString)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXQueryServerString)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXQueryServerString_FUNC);
-	rc = (jint)glXQueryServerString((Display *)arg0, arg1, arg2);
+	rc = (jintLong)glXQueryServerString((Display *)arg0, arg1, arg2);
 	GLX_NATIVE_EXIT(env, that, _1glXQueryServerString_FUNC);
 	return rc;
 }
@@ -253,7 +253,7 @@ JNIEXPORT jint JNICALL GLX_NATIVE(_1glXQueryServerString)
 
 #ifndef NO__1glXQueryVersion
 JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXQueryVersion)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -272,7 +272,7 @@ fail:
 
 #ifndef NO__1glXSwapBuffers
 JNIEXPORT void JNICALL GLX_NATIVE(_1glXSwapBuffers)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	GLX_NATIVE_ENTER(env, that, _1glXSwapBuffers_FUNC);
 	glXSwapBuffers((Display *)arg0, (GLXDrawable)arg1);
@@ -302,7 +302,7 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXWaitX)
 
 #ifndef NO_memmove
 JNIEXPORT void JNICALL GLX_NATIVE(memmove)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
 {
 	XVisualInfo _arg0, *lparg0=NULL;
 	GLX_NATIVE_ENTER(env, that, memmove_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c
index 28494b96fc..7aec87e5af 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c
@@ -25,7 +25,7 @@ void cacheXVisualInfoFields(JNIEnv *env, jobject lpObject)
 {
 	if (XVisualInfoFc.cached) return;
 	XVisualInfoFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	XVisualInfoFc.visual = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "visual", "I");
+	XVisualInfoFc.visual = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "visual", I_J);
 	XVisualInfoFc.visualid = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "visualid", "I");
 	XVisualInfoFc.screen = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "screen", "I");
 	XVisualInfoFc.depth = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "depth", "I");
@@ -41,7 +41,7 @@ void cacheXVisualInfoFields(JNIEnv *env, jobject lpObject)
 XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
 {
 	if (!XVisualInfoFc.cached) cacheXVisualInfoFields(env, lpObject);
-	lpStruct->visual = (Visual *)(*env)->GetIntField(env, lpObject, XVisualInfoFc.visual);
+	lpStruct->visual = (Visual *)(*env)->GetIntLongField(env, lpObject, XVisualInfoFc.visual);
 	lpStruct->visualid = (*env)->GetIntField(env, lpObject, XVisualInfoFc.visualid);
 	lpStruct->screen = (*env)->GetIntField(env, lpObject, XVisualInfoFc.screen);
 	lpStruct->depth = (*env)->GetIntField(env, lpObject, XVisualInfoFc.depth);
@@ -57,7 +57,7 @@ XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lp
 void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
 {
 	if (!XVisualInfoFc.cached) cacheXVisualInfoFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, XVisualInfoFc.visual, (jint)lpStruct->visual);
+	(*env)->SetIntLongField(env, lpObject, XVisualInfoFc.visual, (jintLong)lpStruct->visual);
 	(*env)->SetIntField(env, lpObject, XVisualInfoFc.visualid, (jint)lpStruct->visualid);
 	(*env)->SetIntField(env, lpObject, XVisualInfoFc.screen, (jint)lpStruct->screen);
 	(*env)->SetIntField(env, lpObject, XVisualInfoFc.depth, (jint)lpStruct->depth);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c
index 7f3c3f0f12..85eed92707 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c
@@ -17,7 +17,7 @@
 
 #ifndef NO_ChoosePixelFormat
 JNIEXPORT jint JNICALL WGL_NATIVE(ChoosePixelFormat)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	PIXELFORMATDESCRIPTOR _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -33,7 +33,7 @@ fail:
 
 #ifndef NO_DescribePixelFormat
 JNIEXPORT jint JNICALL WGL_NATIVE(DescribePixelFormat)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3)
 {
 	PIXELFORMATDESCRIPTOR _arg3, *lparg3=NULL;
 	jint rc = 0;
@@ -49,7 +49,7 @@ fail:
 
 #ifndef NO_GetPixelFormat
 JNIEXPORT jint JNICALL WGL_NATIVE(GetPixelFormat)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	WGL_NATIVE_ENTER(env, that, GetPixelFormat_FUNC);
@@ -61,7 +61,7 @@ JNIEXPORT jint JNICALL WGL_NATIVE(GetPixelFormat)
 
 #ifndef NO_SetPixelFormat
 JNIEXPORT jboolean JNICALL WGL_NATIVE(SetPixelFormat)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	PIXELFORMATDESCRIPTOR _arg2, *lparg2=NULL;
 	jboolean rc = 0;
@@ -77,7 +77,7 @@ fail:
 
 #ifndef NO_SwapBuffers
 JNIEXPORT jboolean JNICALL WGL_NATIVE(SwapBuffers)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, SwapBuffers_FUNC);
@@ -89,7 +89,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(SwapBuffers)
 
 #ifndef NO_wglCopyContext
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglCopyContext)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglCopyContext_FUNC);
@@ -100,24 +100,24 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglCopyContext)
 #endif
 
 #ifndef NO_wglCreateContext
-JNIEXPORT jint JNICALL WGL_NATIVE(wglCreateContext)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL WGL_NATIVE(wglCreateContext)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglCreateContext_FUNC);
-	rc = (jint)wglCreateContext((HDC)arg0);
+	rc = (jintLong)wglCreateContext((HDC)arg0);
 	WGL_NATIVE_EXIT(env, that, wglCreateContext_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_wglCreateLayerContext
-JNIEXPORT jint JNICALL WGL_NATIVE(wglCreateLayerContext)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL WGL_NATIVE(wglCreateLayerContext)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglCreateLayerContext_FUNC);
-	rc = (jint)wglCreateLayerContext((HDC)arg0, arg1);
+	rc = (jintLong)wglCreateLayerContext((HDC)arg0, arg1);
 	WGL_NATIVE_EXIT(env, that, wglCreateLayerContext_FUNC);
 	return rc;
 }
@@ -125,7 +125,7 @@ JNIEXPORT jint JNICALL WGL_NATIVE(wglCreateLayerContext)
 
 #ifndef NO_wglDeleteContext
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglDeleteContext)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglDeleteContext_FUNC);
@@ -137,7 +137,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglDeleteContext)
 
 #ifndef NO_wglDescribeLayerPlane
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglDescribeLayerPlane)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
 {
 	LAYERPLANEDESCRIPTOR _arg4, *lparg4=NULL;
 	jboolean rc = 0;
@@ -152,24 +152,24 @@ fail:
 #endif
 
 #ifndef NO_wglGetCurrentContext
-JNIEXPORT jint JNICALL WGL_NATIVE(wglGetCurrentContext)
+JNIEXPORT jintLong JNICALL WGL_NATIVE(wglGetCurrentContext)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglGetCurrentContext_FUNC);
-	rc = (jint)wglGetCurrentContext();
+	rc = (jintLong)wglGetCurrentContext();
 	WGL_NATIVE_EXIT(env, that, wglGetCurrentContext_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_wglGetCurrentDC
-JNIEXPORT jint JNICALL WGL_NATIVE(wglGetCurrentDC)
+JNIEXPORT jintLong JNICALL WGL_NATIVE(wglGetCurrentDC)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglGetCurrentDC_FUNC);
-	rc = (jint)wglGetCurrentDC();
+	rc = (jintLong)wglGetCurrentDC();
 	WGL_NATIVE_EXIT(env, that, wglGetCurrentDC_FUNC);
 	return rc;
 }
@@ -177,7 +177,7 @@ JNIEXPORT jint JNICALL WGL_NATIVE(wglGetCurrentDC)
 
 #ifndef NO_wglGetLayerPaletteEntries
 JNIEXPORT jint JNICALL WGL_NATIVE(wglGetLayerPaletteEntries)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
@@ -192,14 +192,14 @@ fail:
 #endif
 
 #ifndef NO_wglGetProcAddress
-JNIEXPORT jint JNICALL WGL_NATIVE(wglGetProcAddress)
+JNIEXPORT jintLong JNICALL WGL_NATIVE(wglGetProcAddress)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglGetProcAddress_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)wglGetProcAddress(lparg0);
+	rc = (jintLong)wglGetProcAddress(lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	WGL_NATIVE_EXIT(env, that, wglGetProcAddress_FUNC);
@@ -209,7 +209,7 @@ fail:
 
 #ifndef NO_wglMakeCurrent
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglMakeCurrent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglMakeCurrent_FUNC);
@@ -221,7 +221,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglMakeCurrent)
 
 #ifndef NO_wglRealizeLayerPalette
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglRealizeLayerPalette)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglRealizeLayerPalette_FUNC);
@@ -233,7 +233,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglRealizeLayerPalette)
 
 #ifndef NO_wglSetLayerPaletteEntries
 JNIEXPORT jint JNICALL WGL_NATIVE(wglSetLayerPaletteEntries)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
@@ -249,7 +249,7 @@ fail:
 
 #ifndef NO_wglShareLists
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglShareLists)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglShareLists_FUNC);
@@ -261,7 +261,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglShareLists)
 
 #ifndef NO_wglSwapLayerBuffers
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglSwapLayerBuffers)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglSwapLayerBuffers_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c
index d657da4cc4..cbdd5b1287 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c
@@ -39,7 +39,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(CAIRO_1VERSION_1ENCODE)
 
 #ifndef NO__1cairo_1append_1path
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1append_1path)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1append_1path_FUNC);
 	cairo_append_path((cairo_t *)arg0, (cairo_path_t *)arg1);
@@ -49,7 +49,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1append_1path)
 
 #ifndef NO__1cairo_1arc
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1arc)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1arc_FUNC);
 	cairo_arc((cairo_t *)arg0, arg1, arg2, arg3, arg4, arg5);
@@ -59,7 +59,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1arc)
 
 #ifndef NO__1cairo_1arc_1negative
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1arc_1negative)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1arc_1negative_FUNC);
 	cairo_arc_negative((cairo_t *)arg0, arg1, arg2, arg3, arg4, arg5);
@@ -69,7 +69,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1arc_1negative)
 
 #ifndef NO__1cairo_1clip
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1clip)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1clip_FUNC);
 	cairo_clip((cairo_t *)arg0);
@@ -79,7 +79,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1clip)
 
 #ifndef NO__1cairo_1clip_1preserve
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1clip_1preserve)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1clip_1preserve_FUNC);
 	cairo_clip_preserve((cairo_t *)arg0);
@@ -89,7 +89,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1clip_1preserve)
 
 #ifndef NO__1cairo_1close_1path
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1close_1path)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1close_1path_FUNC);
 	cairo_close_path((cairo_t *)arg0);
@@ -99,7 +99,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1close_1path)
 
 #ifndef NO__1cairo_1copy_1page
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1copy_1page)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1copy_1page_FUNC);
 	cairo_copy_page((cairo_t *)arg0);
@@ -108,36 +108,36 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1copy_1page)
 #endif
 
 #ifndef NO__1cairo_1copy_1path
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1copy_1path)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1copy_1path)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1copy_1path_FUNC);
-	rc = (jint)cairo_copy_path((cairo_t *)arg0);
+	rc = (jintLong)cairo_copy_path((cairo_t *)arg0);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1copy_1path_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1cairo_1copy_1path_1flat
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1copy_1path_1flat)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1copy_1path_1flat)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1copy_1path_1flat_FUNC);
-	rc = (jint)cairo_copy_path_flat((cairo_t *)arg0);
+	rc = (jintLong)cairo_copy_path_flat((cairo_t *)arg0);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1copy_1path_1flat_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1cairo_1create
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1create)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1create)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1create_FUNC);
-	rc = (jint)cairo_create((cairo_surface_t *)arg0);
+	rc = (jintLong)cairo_create((cairo_surface_t *)arg0);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1create_FUNC);
 	return rc;
 }
@@ -145,7 +145,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1create)
 
 #ifndef NO__1cairo_1curve_1to
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1curve_1to)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1curve_1to_FUNC);
 	cairo_curve_to((cairo_t *)arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -155,7 +155,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1curve_1to)
 
 #ifndef NO__1cairo_1destroy
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1destroy_FUNC);
 	cairo_destroy((cairo_t *)arg0);
@@ -165,7 +165,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1destroy)
 
 #ifndef NO__1cairo_1device_1to_1user
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1device_1to_1user)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
 {
 	jdouble *lparg1=NULL;
 	jdouble *lparg2=NULL;
@@ -182,7 +182,7 @@ fail:
 
 #ifndef NO__1cairo_1device_1to_1user_1distance
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1device_1to_1user_1distance)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
 {
 	jdouble *lparg1=NULL;
 	jdouble *lparg2=NULL;
@@ -199,7 +199,7 @@ fail:
 
 #ifndef NO__1cairo_1fill
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1fill_FUNC);
 	cairo_fill((cairo_t *)arg0);
@@ -209,7 +209,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill)
 
 #ifndef NO__1cairo_1fill_1extents
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill_1extents)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4)
 {
 	jdouble *lparg1=NULL;
 	jdouble *lparg2=NULL;
@@ -232,7 +232,7 @@ fail:
 
 #ifndef NO__1cairo_1fill_1preserve
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill_1preserve)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1fill_1preserve_FUNC);
 	cairo_fill_preserve((cairo_t *)arg0);
@@ -242,7 +242,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill_1preserve)
 
 #ifndef NO__1cairo_1font_1extents
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1extents)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	cairo_font_extents_t _arg1, *lparg1=NULL;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1extents_FUNC);
@@ -255,12 +255,12 @@ fail:
 #endif
 
 #ifndef NO__1cairo_1font_1options_1create
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1font_1options_1create)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1font_1options_1create)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1create_FUNC);
-	rc = (jint)cairo_font_options_create();
+	rc = (jintLong)cairo_font_options_create();
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1font_1options_1create_FUNC);
 	return rc;
 }
@@ -268,7 +268,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1font_1options_1create)
 
 #ifndef NO__1cairo_1font_1options_1destroy
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1options_1destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1destroy_FUNC);
 	cairo_font_options_destroy((cairo_font_options_t *)arg0);
@@ -278,7 +278,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1options_1destroy)
 
 #ifndef NO__1cairo_1font_1options_1get_1antialias
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1font_1options_1get_1antialias)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1get_1antialias_FUNC);
@@ -290,7 +290,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1font_1options_1get_1antialias)
 
 #ifndef NO__1cairo_1font_1options_1set_1antialias
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1options_1set_1antialias)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1set_1antialias_FUNC);
 	cairo_font_options_set_antialias((cairo_font_options_t *)arg0, arg1);
@@ -300,7 +300,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1options_1set_1antialias)
 
 #ifndef NO__1cairo_1get_1antialias
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1antialias)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1antialias_FUNC);
@@ -312,7 +312,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1antialias)
 
 #ifndef NO__1cairo_1get_1current_1point
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1current_1point)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
 {
 	jdouble *lparg1=NULL;
 	jdouble *lparg2=NULL;
@@ -329,7 +329,7 @@ fail:
 
 #ifndef NO__1cairo_1get_1fill_1rule
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1fill_1rule)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1fill_1rule_FUNC);
@@ -340,12 +340,12 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1fill_1rule)
 #endif
 
 #ifndef NO__1cairo_1get_1font_1face
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1font_1face)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1get_1font_1face)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1font_1face_FUNC);
-	rc = (jint)cairo_get_font_face((cairo_t *)arg0);
+	rc = (jintLong)cairo_get_font_face((cairo_t *)arg0);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1get_1font_1face_FUNC);
 	return rc;
 }
@@ -353,7 +353,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1font_1face)
 
 #ifndef NO__1cairo_1get_1font_1matrix
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1font_1matrix)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
 {
 	jdouble *lparg1=NULL;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1font_1matrix_FUNC);
@@ -367,7 +367,7 @@ fail:
 
 #ifndef NO__1cairo_1get_1font_1options
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1font_1options)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1font_1options_FUNC);
 	cairo_get_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
@@ -377,7 +377,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1font_1options)
 
 #ifndef NO__1cairo_1get_1line_1cap
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1line_1cap)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1line_1cap_FUNC);
@@ -389,7 +389,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1line_1cap)
 
 #ifndef NO__1cairo_1get_1line_1join
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1line_1join)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1line_1join_FUNC);
@@ -401,7 +401,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1line_1join)
 
 #ifndef NO__1cairo_1get_1line_1width
 JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1line_1width)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1line_1width_FUNC);
@@ -413,7 +413,7 @@ JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1line_1width)
 
 #ifndef NO__1cairo_1get_1matrix
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1matrix)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
 {
 	jdouble *lparg1=NULL;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1matrix_FUNC);
@@ -427,7 +427,7 @@ fail:
 
 #ifndef NO__1cairo_1get_1miter_1limit
 JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1miter_1limit)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1miter_1limit_FUNC);
@@ -439,7 +439,7 @@ JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1miter_1limit)
 
 #ifndef NO__1cairo_1get_1operator
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1operator)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1operator_FUNC);
@@ -450,24 +450,24 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1operator)
 #endif
 
 #ifndef NO__1cairo_1get_1source
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1source)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1get_1source)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1source_FUNC);
-	rc = (jint)cairo_get_source((cairo_t *)arg0);
+	rc = (jintLong)cairo_get_source((cairo_t *)arg0);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1get_1source_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1cairo_1get_1target
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1target)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1get_1target)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1target_FUNC);
-	rc = (jint)cairo_get_target((cairo_t *)arg0);
+	rc = (jintLong)cairo_get_target((cairo_t *)arg0);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1get_1target_FUNC);
 	return rc;
 }
@@ -475,7 +475,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1target)
 
 #ifndef NO__1cairo_1get_1tolerance
 JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1tolerance)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1tolerance_FUNC);
@@ -487,7 +487,7 @@ JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1tolerance)
 
 #ifndef NO__1cairo_1glyph_1extents
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1glyph_1extents)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1glyph_1extents_FUNC);
 	cairo_glyph_extents((cairo_t *)arg0, (cairo_glyph_t *)arg1, arg2, (cairo_text_extents_t *)arg3);
@@ -497,7 +497,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1glyph_1extents)
 
 #ifndef NO__1cairo_1glyph_1path
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1glyph_1path)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1glyph_1path_FUNC);
 	cairo_glyph_path((cairo_t *)arg0, (cairo_glyph_t *)arg1, arg2);
@@ -507,7 +507,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1glyph_1path)
 
 #ifndef NO__1cairo_1identity_1matrix
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1identity_1matrix)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1identity_1matrix_FUNC);
 	cairo_identity_matrix((cairo_t *)arg0);
@@ -516,24 +516,24 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1identity_1matrix)
 #endif
 
 #ifndef NO__1cairo_1image_1surface_1create
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1create_FUNC);
-	rc = (jint)cairo_image_surface_create(arg0, arg1, arg2);
+	rc = (jintLong)cairo_image_surface_create(arg0, arg1, arg2);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1image_1surface_1create_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1cairo_1image_1surface_1create_1for_1data
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create_1for_1data)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create_1for_1data)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1create_1for_1data_FUNC);
-	rc = (jint)cairo_image_surface_create_for_data((unsigned char *)arg0, arg1, arg2, arg3, arg4);
+	rc = (jintLong)cairo_image_surface_create_for_data((unsigned char *)arg0, arg1, arg2, arg3, arg4);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1image_1surface_1create_1for_1data_FUNC);
 	return rc;
 }
@@ -541,7 +541,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create_1for_1data)
 
 #ifndef NO__1cairo_1image_1surface_1get_1height
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1height)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1get_1height_FUNC);
@@ -553,7 +553,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1height)
 
 #ifndef NO__1cairo_1image_1surface_1get_1width
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1width)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1get_1width_FUNC);
@@ -565,7 +565,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1width)
 
 #ifndef NO__1cairo_1in_1fill
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1in_1fill)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1in_1fill_FUNC);
@@ -577,7 +577,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1in_1fill)
 
 #ifndef NO__1cairo_1in_1stroke
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1in_1stroke)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1in_1stroke_FUNC);
@@ -589,7 +589,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1in_1stroke)
 
 #ifndef NO__1cairo_1line_1to
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1line_1to)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1line_1to_FUNC);
 	cairo_line_to((cairo_t *)arg0, arg1, arg2);
@@ -599,7 +599,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1line_1to)
 
 #ifndef NO__1cairo_1mask
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1mask)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1mask_FUNC);
 	cairo_mask((cairo_t *)arg0, (cairo_pattern_t *)arg1);
@@ -609,7 +609,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1mask)
 
 #ifndef NO__1cairo_1mask_1surface
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1mask_1surface)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jdouble arg2, jdouble arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1mask_1surface_FUNC);
 	cairo_mask_surface((cairo_t *)arg0, (cairo_surface_t *)arg1, arg2, arg3);
@@ -807,7 +807,7 @@ fail:
 
 #ifndef NO__1cairo_1move_1to
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1move_1to)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1move_1to_FUNC);
 	cairo_move_to((cairo_t *)arg0, arg1, arg2);
@@ -817,7 +817,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1move_1to)
 
 #ifndef NO__1cairo_1new_1path
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1new_1path)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1new_1path_FUNC);
 	cairo_new_path((cairo_t *)arg0);
@@ -827,7 +827,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1new_1path)
 
 #ifndef NO__1cairo_1paint
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1paint)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1paint_FUNC);
 	cairo_paint((cairo_t *)arg0);
@@ -837,7 +837,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1paint)
 
 #ifndef NO__1cairo_1paint_1with_1alpha
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1paint_1with_1alpha)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1paint_1with_1alpha_FUNC);
 	cairo_paint_with_alpha((cairo_t *)arg0, arg1);
@@ -847,7 +847,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1paint_1with_1alpha)
 
 #ifndef NO__1cairo_1path_1destroy
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1path_1destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1path_1destroy_FUNC);
 	cairo_path_destroy((cairo_path_t *)arg0);
@@ -857,7 +857,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1path_1destroy)
 
 #ifndef NO__1cairo_1pattern_1add_1color_1stop_1rgb
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1add_1color_1stop_1rgb)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1add_1color_1stop_1rgb_FUNC);
 	cairo_pattern_add_color_stop_rgb((cairo_pattern_t *)arg0, arg1, arg2, arg3, arg4);
@@ -867,7 +867,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1add_1color_1stop_1rgb)
 
 #ifndef NO__1cairo_1pattern_1add_1color_1stop_1rgba
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1add_1color_1stop_1rgba)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1add_1color_1stop_1rgba_FUNC);
 	cairo_pattern_add_color_stop_rgba((cairo_pattern_t *)arg0, arg1, arg2, arg3, arg4, arg5);
@@ -876,36 +876,36 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1add_1color_1stop_1rgba)
 #endif
 
 #ifndef NO__1cairo_1pattern_1create_1for_1surface
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1for_1surface)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1for_1surface)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1create_1for_1surface_FUNC);
-	rc = (jint)cairo_pattern_create_for_surface((cairo_surface_t *)arg0);
+	rc = (jintLong)cairo_pattern_create_for_surface((cairo_surface_t *)arg0);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1pattern_1create_1for_1surface_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1cairo_1pattern_1create_1linear
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1linear)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1linear)
 	(JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdouble arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1create_1linear_FUNC);
-	rc = (jint)cairo_pattern_create_linear(arg0, arg1, arg2, arg3);
+	rc = (jintLong)cairo_pattern_create_linear(arg0, arg1, arg2, arg3);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1pattern_1create_1linear_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1cairo_1pattern_1create_1radial
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1radial)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1radial)
 	(JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1create_1radial_FUNC);
-	rc = (jint)cairo_pattern_create_radial(arg0, arg1, arg2, arg3, arg4, arg5);
+	rc = (jintLong)cairo_pattern_create_radial(arg0, arg1, arg2, arg3, arg4, arg5);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1pattern_1create_1radial_FUNC);
 	return rc;
 }
@@ -913,7 +913,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1radial)
 
 #ifndef NO__1cairo_1pattern_1destroy
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1destroy_FUNC);
 	cairo_pattern_destroy((cairo_pattern_t *)arg0);
@@ -923,7 +923,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1destroy)
 
 #ifndef NO__1cairo_1pattern_1get_1extend
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1extend)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1get_1extend_FUNC);
@@ -935,7 +935,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1extend)
 
 #ifndef NO__1cairo_1pattern_1get_1filter
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1filter)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1get_1filter_FUNC);
@@ -947,7 +947,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1filter)
 
 #ifndef NO__1cairo_1pattern_1get_1matrix
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1matrix)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
 {
 	jdouble *lparg1=NULL;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1get_1matrix_FUNC);
@@ -961,7 +961,7 @@ fail:
 
 #ifndef NO__1cairo_1pattern_1reference
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1reference)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1reference_FUNC);
 	cairo_pattern_reference((cairo_pattern_t *)arg0);
@@ -971,7 +971,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1reference)
 
 #ifndef NO__1cairo_1pattern_1set_1extend
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1extend)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1set_1extend_FUNC);
 	cairo_pattern_set_extend((cairo_pattern_t *)arg0, arg1);
@@ -981,7 +981,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1extend)
 
 #ifndef NO__1cairo_1pattern_1set_1filter
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1filter)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1set_1filter_FUNC);
 	cairo_pattern_set_filter((cairo_pattern_t *)arg0, arg1);
@@ -991,7 +991,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1filter)
 
 #ifndef NO__1cairo_1pattern_1set_1matrix
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1matrix)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
 {
 	jdouble *lparg1=NULL;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1set_1matrix_FUNC);
@@ -1005,24 +1005,16 @@ fail:
 
 #ifndef NO__1cairo_1pdf_1surface_1set_1size
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pdf_1surface_1set_1size)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1pdf_1surface_1set_1size_FUNC);
 /*
 	cairo_pdf_surface_set_size((cairo_surface_t *)arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(cairo_surface_t *, jdouble, jdouble);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(cairo_pdf_surface_set_size_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "cairo_pdf_surface_set_size");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((cairo_surface_t *)arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, cairo_pdf_surface_set_size)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(cairo_surface_t *, jdouble, jdouble))fp)((cairo_surface_t *)arg0, arg1, arg2);
 		}
 	}
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1pdf_1surface_1set_1size_FUNC);
@@ -1031,24 +1023,16 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pdf_1surface_1set_1size)
 
 #ifndef NO__1cairo_1ps_1surface_1set_1size
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1ps_1surface_1set_1size)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1ps_1surface_1set_1size_FUNC);
 /*
 	cairo_ps_surface_set_size((cairo_surface_t *)arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(cairo_surface_t *, jdouble, jdouble);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(cairo_ps_surface_set_size_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "cairo_ps_surface_set_size");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((cairo_surface_t *)arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, cairo_ps_surface_set_size)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(cairo_surface_t *, jdouble, jdouble))fp)((cairo_surface_t *)arg0, arg1, arg2);
 		}
 	}
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1ps_1surface_1set_1size_FUNC);
@@ -1057,7 +1041,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1ps_1surface_1set_1size)
 
 #ifndef NO__1cairo_1rectangle
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rectangle)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1rectangle_FUNC);
 	cairo_rectangle((cairo_t *)arg0, arg1, arg2, arg3, arg4);
@@ -1066,12 +1050,12 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rectangle)
 #endif
 
 #ifndef NO__1cairo_1reference
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1reference)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1reference)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1reference_FUNC);
-	rc = (jint)cairo_reference((cairo_t *)arg0);
+	rc = (jintLong)cairo_reference((cairo_t *)arg0);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1reference_FUNC);
 	return rc;
 }
@@ -1079,7 +1063,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1reference)
 
 #ifndef NO__1cairo_1rel_1curve_1to
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1curve_1to)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1rel_1curve_1to_FUNC);
 	cairo_rel_curve_to((cairo_t *)arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1089,7 +1073,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1curve_1to)
 
 #ifndef NO__1cairo_1rel_1line_1to
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1line_1to)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1rel_1line_1to_FUNC);
 	cairo_rel_line_to((cairo_t *)arg0, arg1, arg2);
@@ -1099,7 +1083,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1line_1to)
 
 #ifndef NO__1cairo_1rel_1move_1to
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1move_1to)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1rel_1move_1to_FUNC);
 	cairo_rel_move_to((cairo_t *)arg0, arg1, arg2);
@@ -1109,7 +1093,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1move_1to)
 
 #ifndef NO__1cairo_1reset_1clip
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1reset_1clip)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1reset_1clip_FUNC);
 	cairo_reset_clip((cairo_t *)arg0);
@@ -1119,7 +1103,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1reset_1clip)
 
 #ifndef NO__1cairo_1restore
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1restore)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1restore_FUNC);
 	cairo_restore((cairo_t *)arg0);
@@ -1129,7 +1113,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1restore)
 
 #ifndef NO__1cairo_1rotate
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rotate)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1rotate_FUNC);
 	cairo_rotate((cairo_t *)arg0, arg1);
@@ -1139,7 +1123,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rotate)
 
 #ifndef NO__1cairo_1save
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1save)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1save_FUNC);
 	cairo_save((cairo_t *)arg0);
@@ -1149,7 +1133,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1save)
 
 #ifndef NO__1cairo_1scale
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1scale)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1scale_FUNC);
 	cairo_scale((cairo_t *)arg0, arg1, arg2);
@@ -1159,7 +1143,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1scale)
 
 #ifndef NO__1cairo_1select_1font_1face
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1select_1font_1face)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3)
 {
 	jbyte *lparg1=NULL;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1select_1font_1face_FUNC);
@@ -1173,7 +1157,7 @@ fail:
 
 #ifndef NO__1cairo_1set_1antialias
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1antialias)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1antialias_FUNC);
 	cairo_set_antialias((cairo_t *)arg0, arg1);
@@ -1183,7 +1167,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1antialias)
 
 #ifndef NO__1cairo_1set_1dash
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1dash)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jint arg2, jdouble arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jint arg2, jdouble arg3)
 {
 	jdouble *lparg1=NULL;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1dash_FUNC);
@@ -1197,7 +1181,7 @@ fail:
 
 #ifndef NO__1cairo_1set_1fill_1rule
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1fill_1rule)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1fill_1rule_FUNC);
 	cairo_set_fill_rule((cairo_t *)arg0, arg1);
@@ -1207,7 +1191,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1fill_1rule)
 
 #ifndef NO__1cairo_1set_1font_1face
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1face)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1font_1face_FUNC);
 	cairo_set_font_face((cairo_t *)arg0, (cairo_font_face_t *)arg1);
@@ -1217,7 +1201,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1face)
 
 #ifndef NO__1cairo_1set_1font_1matrix
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1matrix)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
 {
 	jdouble *lparg1=NULL;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1font_1matrix_FUNC);
@@ -1231,7 +1215,7 @@ fail:
 
 #ifndef NO__1cairo_1set_1font_1options
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1options)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1font_1options_FUNC);
 	cairo_set_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
@@ -1241,7 +1225,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1options)
 
 #ifndef NO__1cairo_1set_1font_1size
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1size)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1font_1size_FUNC);
 	cairo_set_font_size((cairo_t *)arg0, arg1);
@@ -1251,7 +1235,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1size)
 
 #ifndef NO__1cairo_1set_1line_1cap
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1cap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1line_1cap_FUNC);
 	cairo_set_line_cap((cairo_t *)arg0, arg1);
@@ -1261,7 +1245,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1cap)
 
 #ifndef NO__1cairo_1set_1line_1join
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1join)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1line_1join_FUNC);
 	cairo_set_line_join((cairo_t *)arg0, arg1);
@@ -1271,7 +1255,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1join)
 
 #ifndef NO__1cairo_1set_1line_1width
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1width)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1line_1width_FUNC);
 	cairo_set_line_width((cairo_t *)arg0, arg1);
@@ -1281,7 +1265,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1width)
 
 #ifndef NO__1cairo_1set_1matrix
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1matrix)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
 {
 	jdouble *lparg1=NULL;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1matrix_FUNC);
@@ -1295,7 +1279,7 @@ fail:
 
 #ifndef NO__1cairo_1set_1miter_1limit
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1miter_1limit)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1miter_1limit_FUNC);
 	cairo_set_miter_limit((cairo_t *)arg0, arg1);
@@ -1305,7 +1289,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1miter_1limit)
 
 #ifndef NO__1cairo_1set_1operator
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1operator)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1operator_FUNC);
 	cairo_set_operator((cairo_t *)arg0, arg1);
@@ -1315,7 +1299,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1operator)
 
 #ifndef NO__1cairo_1set_1source
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1source_FUNC);
 	cairo_set_source((cairo_t *)arg0, (cairo_pattern_t *)arg1);
@@ -1325,7 +1309,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source)
 
 #ifndef NO__1cairo_1set_1source_1rgb
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1rgb)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1source_1rgb_FUNC);
 	cairo_set_source_rgb((cairo_t *)arg0, arg1, arg2, arg3);
@@ -1335,7 +1319,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1rgb)
 
 #ifndef NO__1cairo_1set_1source_1rgba
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1rgba)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1source_1rgba_FUNC);
 	cairo_set_source_rgba((cairo_t *)arg0, arg1, arg2, arg3, arg4);
@@ -1345,7 +1329,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1rgba)
 
 #ifndef NO__1cairo_1set_1source_1surface
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1surface)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jdouble arg2, jdouble arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1source_1surface_FUNC);
 	cairo_set_source_surface((cairo_t *)arg0, (cairo_surface_t *)arg1, arg2, arg3);
@@ -1355,7 +1339,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1surface)
 
 #ifndef NO__1cairo_1set_1tolerance
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1tolerance)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1tolerance_FUNC);
 	cairo_set_tolerance((cairo_t *)arg0, arg1);
@@ -1365,7 +1349,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1tolerance)
 
 #ifndef NO__1cairo_1show_1glyphs
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1glyphs)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1show_1glyphs_FUNC);
 	cairo_show_glyphs((cairo_t *)arg0, (cairo_glyph_t *)arg1, arg2);
@@ -1375,7 +1359,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1glyphs)
 
 #ifndef NO__1cairo_1show_1page
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1page)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1show_1page_FUNC);
 	cairo_show_page((cairo_t *)arg0);
@@ -1385,7 +1369,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1page)
 
 #ifndef NO__1cairo_1show_1text
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1text)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1show_1text_FUNC);
@@ -1399,7 +1383,7 @@ fail:
 
 #ifndef NO__1cairo_1status
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1status)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1status_FUNC);
@@ -1410,12 +1394,12 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1status)
 #endif
 
 #ifndef NO__1cairo_1status_1to_1string
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1status_1to_1string)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1status_1to_1string)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1status_1to_1string_FUNC);
-	rc = (jint)cairo_status_to_string(arg0);
+	rc = (jintLong)cairo_status_to_string(arg0);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1status_1to_1string_FUNC);
 	return rc;
 }
@@ -1423,7 +1407,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1status_1to_1string)
 
 #ifndef NO__1cairo_1stroke
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1stroke_FUNC);
 	cairo_stroke((cairo_t *)arg0);
@@ -1433,7 +1417,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke)
 
 #ifndef NO__1cairo_1stroke_1extents
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke_1extents)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4)
 {
 	jdouble *lparg1=NULL;
 	jdouble *lparg2=NULL;
@@ -1456,7 +1440,7 @@ fail:
 
 #ifndef NO__1cairo_1stroke_1preserve
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke_1preserve)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1stroke_1preserve_FUNC);
 	cairo_stroke_preserve((cairo_t *)arg0);
@@ -1465,12 +1449,12 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke_1preserve)
 #endif
 
 #ifndef NO__1cairo_1surface_1create_1similar
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1create_1similar)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1surface_1create_1similar)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1create_1similar_FUNC);
-	rc = (jint)cairo_surface_create_similar((cairo_surface_t *)arg0, arg1, arg2, arg3);
+	rc = (jintLong)cairo_surface_create_similar((cairo_surface_t *)arg0, arg1, arg2, arg3);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1surface_1create_1similar_FUNC);
 	return rc;
 }
@@ -1478,7 +1462,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1create_1similar)
 
 #ifndef NO__1cairo_1surface_1destroy
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1destroy_FUNC);
 	cairo_surface_destroy((cairo_surface_t *)arg0);
@@ -1488,7 +1472,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1destroy)
 
 #ifndef NO__1cairo_1surface_1finish
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1finish)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1finish_FUNC);
 	cairo_surface_finish((cairo_surface_t *)arg0);
@@ -1498,7 +1482,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1finish)
 
 #ifndef NO__1cairo_1surface_1get_1type
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1type)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1get_1type_FUNC);
@@ -1506,18 +1490,9 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1type)
 	rc = (jint)cairo_surface_get_type((cairo_surface_t *)arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(cairo_surface_t *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(cairo_surface_get_type_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "cairo_surface_get_type");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((cairo_surface_t *)arg0);
+		LOAD_FUNCTION(fp, cairo_surface_get_type)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(cairo_surface_t *))fp)((cairo_surface_t *)arg0);
 		}
 	}
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1surface_1get_1type_FUNC);
@@ -1526,12 +1501,12 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1type)
 #endif
 
 #ifndef NO__1cairo_1surface_1get_1user_1data
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1user_1data)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1user_1data)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1get_1user_1data_FUNC);
-	rc = (jint)cairo_surface_get_user_data((cairo_surface_t *)arg0, (cairo_user_data_key_t *)arg1);
+	rc = (jintLong)cairo_surface_get_user_data((cairo_surface_t *)arg0, (cairo_user_data_key_t *)arg1);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1surface_1get_1user_1data_FUNC);
 	return rc;
 }
@@ -1539,7 +1514,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1user_1data)
 
 #ifndef NO__1cairo_1surface_1reference
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1reference)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1reference_FUNC);
 	cairo_surface_reference((cairo_surface_t *)arg0);
@@ -1549,7 +1524,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1reference)
 
 #ifndef NO__1cairo_1surface_1set_1device_1offset
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1device_1offset)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1set_1device_1offset_FUNC);
 	cairo_surface_set_device_offset((cairo_surface_t *)arg0, arg1, arg2);
@@ -1559,24 +1534,16 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1device_1offset)
 
 #ifndef NO__1cairo_1surface_1set_1fallback_1resolution
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1fallback_1resolution)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1set_1fallback_1resolution_FUNC);
 /*
 	cairo_surface_set_fallback_resolution(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jdouble, jdouble);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(cairo_surface_set_fallback_resolution_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "cairo_surface_set_fallback_resolution");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, cairo_surface_set_fallback_resolution)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jdouble, jdouble))fp)(arg0, arg1, arg2);
 		}
 	}
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1surface_1set_1fallback_1resolution_FUNC);
@@ -1585,7 +1552,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1fallback_1resolution)
 
 #ifndef NO__1cairo_1surface_1set_1user_1data
 JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1user_1data)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
 {
 	jint rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1set_1user_1data_FUNC);
@@ -1597,7 +1564,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1user_1data)
 
 #ifndef NO__1cairo_1text_1extents
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1text_1extents)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2)
 {
 	jbyte *lparg1=NULL;
 	cairo_text_extents_t _arg2, *lparg2=NULL;
@@ -1614,7 +1581,7 @@ fail:
 
 #ifndef NO__1cairo_1text_1path
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1text_1path)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1text_1path_FUNC);
@@ -1628,7 +1595,7 @@ fail:
 
 #ifndef NO__1cairo_1transform
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1transform)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
 {
 	jdouble *lparg1=NULL;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1transform_FUNC);
@@ -1642,7 +1609,7 @@ fail:
 
 #ifndef NO__1cairo_1translate
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1translate)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1translate_FUNC);
 	cairo_translate((cairo_t *)arg0, arg1, arg2);
@@ -1652,7 +1619,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1translate)
 
 #ifndef NO__1cairo_1user_1to_1device
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1user_1to_1device)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
 {
 	jdouble *lparg1=NULL;
 	jdouble *lparg2=NULL;
@@ -1669,7 +1636,7 @@ fail:
 
 #ifndef NO__1cairo_1user_1to_1device_1distance
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1user_1to_1device_1distance)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
 {
 	jdouble *lparg1=NULL;
 	jdouble *lparg2=NULL;
@@ -1685,24 +1652,24 @@ fail:
 #endif
 
 #ifndef NO__1cairo_1xlib_1surface_1create
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1xlib_1surface_1create_FUNC);
-	rc = (jint)cairo_xlib_surface_create((Display *)arg0, (Drawable)arg1, (Visual *)arg2, arg3, arg4);
+	rc = (jintLong)cairo_xlib_surface_create((Display *)arg0, (Drawable)arg1, (Visual *)arg2, arg3, arg4);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1xlib_1surface_1create_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1cairo_1xlib_1surface_1create_1for_1bitmap
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create_1for_1bitmap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create_1for_1bitmap)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
-	rc = (jint)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, (Screen *)arg2, arg3, arg4);
+	rc = (jintLong)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, (Screen *)arg2, arg3, arg4);
 	Cairo_NATIVE_EXIT(env, that, _1cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
 	return rc;
 }
@@ -1710,7 +1677,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create_1for_1bitmap)
 
 #ifndef NO__1cairo_1xlib_1surface_1set_1size
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1set_1size)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	Cairo_NATIVE_ENTER(env, that, _1cairo_1xlib_1surface_1set_1size_FUNC);
 	cairo_xlib_surface_set_size((cairo_surface_t *)arg0, arg1, arg2);
@@ -1778,45 +1745,78 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1version)
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II
-JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	cairo_path_data_t _arg0, *lparg0=NULL;
+#ifndef JNI64
 	Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC);
+#else
+	Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getcairo_path_data_tFields(env, arg0, &_arg0)) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setcairo_path_data_tFields(env, arg0, lparg0);
+#ifndef JNI64
 	Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC);
+#else
+	Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II
-JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	cairo_path_t _arg0, *lparg0=NULL;
+#ifndef JNI64
 	Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II_FUNC);
+#else
+	Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getcairo_path_tFields(env, arg0, &_arg0)) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setcairo_path_tFields(env, arg0, lparg0);
+#ifndef JNI64
 	Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II_FUNC);
+#else
+	Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove___3DII
-JNIEXPORT void JNICALL Cairo_NATIVE(memmove___3DII)
-	(JNIEnv *env, jclass that, jdoubleArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove___3DII) && !defined(JNI64)) || (!defined(NO_memmove___3DJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL Cairo_NATIVE(memmove___3DII)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL Cairo_NATIVE(memmove___3DJJ)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	jdouble *lparg0=NULL;
+#ifndef JNI64
 	Cairo_NATIVE_ENTER(env, that, memmove___3DII_FUNC);
+#else
+	Cairo_NATIVE_ENTER(env, that, memmove___3DJJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0);
+#ifndef JNI64
 	Cairo_NATIVE_EXIT(env, that, memmove___3DII_FUNC);
+#else
+	Cairo_NATIVE_EXIT(env, that, memmove___3DJJ_FUNC);
+#endif
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c
index 60650ff99a..57be51fed6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c
@@ -169,9 +169,21 @@ char * Cairo_nativeFunctionNames[] = {
 	"cairo_1path_1t_1sizeof",
 	"cairo_1text_1extents_1t_1sizeof",
 	"cairo_1version",
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ",
+#endif
+#ifndef JNI64
 	"memmove___3DII",
+#else
+	"memmove___3DJJ",
+#endif
 };
 
 #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h
index 65076775cb..1b2a1b5d3f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h
@@ -177,7 +177,19 @@ typedef enum {
 	cairo_1path_1t_1sizeof_FUNC,
 	cairo_1text_1extents_1t_1sizeof_FUNC,
 	cairo_1version_FUNC,
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove___3DII_FUNC,
+#else
+	memmove___3DJJ_FUNC,
+#endif
 } Cairo_FUNCS;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c
index 3d2987d1c0..3225703449 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c
@@ -113,7 +113,7 @@ void cachecairo_path_tFields(JNIEnv *env, jobject lpObject)
 	if (cairo_path_tFc.cached) return;
 	cairo_path_tFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	cairo_path_tFc.status = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "status", "I");
-	cairo_path_tFc.data = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "data", "I");
+	cairo_path_tFc.data = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "data", I_J);
 	cairo_path_tFc.num_data = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "num_data", "I");
 	cairo_path_tFc.cached = 1;
 }
@@ -122,7 +122,7 @@ cairo_path_t *getcairo_path_tFields(JNIEnv *env, jobject lpObject, cairo_path_t
 {
 	if (!cairo_path_tFc.cached) cachecairo_path_tFields(env, lpObject);
 	lpStruct->status = (*env)->GetIntField(env, lpObject, cairo_path_tFc.status);
-	lpStruct->data = (cairo_path_data_t *)(*env)->GetIntField(env, lpObject, cairo_path_tFc.data);
+	lpStruct->data = (cairo_path_data_t *)(*env)->GetIntLongField(env, lpObject, cairo_path_tFc.data);
 	lpStruct->num_data = (*env)->GetIntField(env, lpObject, cairo_path_tFc.num_data);
 	return lpStruct;
 }
@@ -131,7 +131,7 @@ void setcairo_path_tFields(JNIEnv *env, jobject lpObject, cairo_path_t *lpStruct
 {
 	if (!cairo_path_tFc.cached) cachecairo_path_tFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, cairo_path_tFc.status, (jint)lpStruct->status);
-	(*env)->SetIntField(env, lpObject, cairo_path_tFc.data, (jint)lpStruct->data);
+	(*env)->SetIntLongField(env, lpObject, cairo_path_tFc.data, (jintLong)lpStruct->data);
 	(*env)->SetIntField(env, lpObject, cairo_path_tFc.num_data, (jint)lpStruct->num_data);
 }
 #endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c
index f4b3287b84..835effff43 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c
@@ -27,18 +27,9 @@ JNIEXPORT jint JNICALL Cocoa_NATIVE(HICocoaViewCreate)
 	rc = (jint)HICocoaViewCreate(arg0, arg1, lparg2);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, jint, jint *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(HICocoaViewCreate_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("HICocoaViewCreate"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, lparg2);
+		LOAD_FUNCTION(fp, HICocoaViewCreate)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
@@ -399,7 +390,11 @@ JNIEXPORT void JNICALL Cocoa_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_inter
 	NSRect _arg0, *lparg0=NULL;
 	Cocoa_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
-	objc_msgSend_stret((void *)lparg0, (void *)arg1, (SEL)arg2);
+	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
+		objc_msgSend_stret((void *)lparg0, (void *)arg1, (SEL)arg2);
+	} else {
+		*lparg0 = (*(NSRect (*)(void *, SEL))objc_msgSend)((void *)arg1, (SEL)arg2);
+	}
 fail:
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
 	Cocoa_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
@@ -415,7 +410,11 @@ JNIEXPORT void JNICALL Cocoa_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_inter
 	Cocoa_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
-	objc_msgSend_stret((void *)lparg0, (void *)arg1, (SEL)arg2, *lparg3, arg4);
+	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
+		objc_msgSend_stret((void *)lparg0, (void *)arg1, (SEL)arg2, *lparg3, arg4);
+	} else {
+		*lparg0 = (*(NSRect (*)(void *, SEL, NSRect, jint))objc_msgSend)((void *)arg1, (SEL)arg2, *lparg3, arg4);
+	}
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.h
index 22e0fea6a4..d49394648d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.h
@@ -19,4 +19,12 @@
 
 #include "cocoa_custom.h"
 
+#ifdef __i386__
+#define STRUCT_SIZE_LIMIT 8
+#elif __ppc__
+#define STRUCT_SIZE_LIMIT 4
+#elif __x86_64__
+#define STRUCT_SIZE_LIMIT 16
+#endif
+
 #endif /* INC_cocoa_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
index 2255fada26..5fc8424274 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
@@ -958,18 +958,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(AXUIElementCreateWithDataBrowserAndItemInfo)
 	rc = (jint)AXUIElementCreateWithDataBrowserAndItemInfo(arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, DataBrowserAccessibilityItemInfo *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(AXUIElementCreateWithDataBrowserAndItemInfo_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("AXUIElementCreateWithDataBrowserAndItemInfo"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, lparg1);
+		LOAD_FUNCTION(fp, AXUIElementCreateWithDataBrowserAndItemInfo)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, DataBrowserAccessibilityItemInfo *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -1003,18 +994,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(AXUIElementGetDataBrowserItemInfo)
 	rc = (jint)AXUIElementGetDataBrowserItemInfo(arg0, arg1, arg2, lparg3);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, jint, jint, DataBrowserAccessibilityItemInfo *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(AXUIElementGetDataBrowserItemInfo_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("AXUIElementGetDataBrowserItemInfo"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, arg2, lparg3);
+		LOAD_FUNCTION(fp, AXUIElementGetDataBrowserItemInfo)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint, DataBrowserAccessibilityItemInfo *))fp)(arg0, arg1, arg2, lparg3);
 		}
 	}
 fail:
@@ -1798,18 +1780,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGBitmapContextCreateImage)
 	rc = (jint)CGBitmapContextCreateImage(arg0);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(CGBitmapContextCreateImage_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("CGBitmapContextCreateImage"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, CGBitmapContextCreateImage)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CGBitmapContextCreateImage_FUNC);
@@ -2186,17 +2159,9 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetBlendMode)
 	CGContextSetBlendMode((CGContextRef)arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(CGContextRef, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(CGContextSetBlendMode_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("CGContextSetBlendMode"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((CGContextRef)arg0, arg1);
+		LOAD_FUNCTION(fp, CGContextSetBlendMode)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(CGContextRef, jint))fp)((CGContextRef)arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CGContextSetBlendMode_FUNC);
@@ -2769,18 +2734,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGImageCreateWithImageInRect)
 	rc = (jint)CGImageCreateWithImageInRect(arg0, *lparg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, CGRect);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(CGImageCreateWithImageInRect_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("CGImageCreateWithImageInRect"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, *lparg1);
+		LOAD_FUNCTION(fp, CGImageCreateWithImageInRect)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, CGRect))fp)(arg0, *lparg1);
 		}
 	}
 fail:
@@ -4218,18 +4174,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DataBrowserChangeAttributes)
 	rc = (jint)DataBrowserChangeAttributes(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(DataBrowserChangeAttributes_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("DataBrowserChangeAttributes"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, DataBrowserChangeAttributes)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, DataBrowserChangeAttributes_FUNC);
@@ -4249,18 +4196,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DataBrowserGetAttributes)
 	rc = (jint)DataBrowserGetAttributes(arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, jint *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(DataBrowserGetAttributes_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("DataBrowserGetAttributes"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, lparg1);
+		LOAD_FUNCTION(fp, DataBrowserGetAttributes)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -4284,18 +4222,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DataBrowserGetMetric)
 	rc = (jint)DataBrowserGetMetric(arg0, arg1, lparg2, lparg3);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, jint, jboolean *, jfloat *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(DataBrowserGetMetric_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("DataBrowserGetMetric"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, lparg2, lparg3);
+		LOAD_FUNCTION(fp, DataBrowserGetMetric)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jboolean *, jfloat *))fp)(arg0, arg1, lparg2, lparg3);
 		}
 	}
 fail:
@@ -4316,18 +4245,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DataBrowserSetMetric)
 	rc = (jint)DataBrowserSetMetric(arg0, arg1, arg2, arg3);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, jint, jboolean, jfloat);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(DataBrowserSetMetric_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("DataBrowserSetMetric"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, arg2, arg3);
+		LOAD_FUNCTION(fp, DataBrowserSetMetric)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jboolean, jfloat))fp)(arg0, arg1, arg2, arg3);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, DataBrowserSetMetric_FUNC);
@@ -6464,18 +6384,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetIconRefFromIconFamilyPtr)
 	rc = (jint)GetIconRefFromIconFamilyPtr(arg0, arg1, lparg2);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, jint, jint *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(GetIconRefFromIconFamilyPtr_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("GetIconRefFromIconFamilyPtr"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, lparg2);
+		LOAD_FUNCTION(fp, GetIconRefFromIconFamilyPtr)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
@@ -7518,18 +7429,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(HIComboBoxIsListVisible)
 	rc = (jboolean)HIComboBoxIsListVisible((HIViewRef)arg0);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jboolean (*FPTR)(HIViewRef);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(HIComboBoxIsListVisible_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("HIComboBoxIsListVisible"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)((HIViewRef)arg0);
+		LOAD_FUNCTION(fp, HIComboBoxIsListVisible)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HIViewRef))fp)((HIViewRef)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, HIComboBoxIsListVisible_FUNC);
@@ -7559,18 +7461,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIComboBoxSetListVisible)
 	rc = (jint)HIComboBoxSetListVisible((HIViewRef)arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(HIViewRef, jboolean);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(HIComboBoxSetListVisible_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("HIComboBoxSetListVisible"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((HIViewRef)arg0, arg1);
+		LOAD_FUNCTION(fp, HIComboBoxSetListVisible)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(HIViewRef, jboolean))fp)((HIViewRef)arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, HIComboBoxSetListVisible_FUNC);
@@ -7602,18 +7495,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(HICreateTransformedCGImage)
 	rc = (jint)HICreateTransformedCGImage((CGImageRef)arg0, arg1, (CGImageRef *)lparg2);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(CGImageRef, jint, CGImageRef *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(HICreateTransformedCGImage_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("HICreateTransformedCGImage"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((CGImageRef)arg0, arg1, (CGImageRef *)lparg2);
+		LOAD_FUNCTION(fp, HICreateTransformedCGImage)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(CGImageRef, jint, CGImageRef *))fp)((CGImageRef)arg0, arg1, (CGImageRef *)lparg2);
 		}
 	}
 fail:
@@ -7807,18 +7691,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIShapeCreateWithQDRgn)
 	rc = (jint)HIShapeCreateWithQDRgn(arg0);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(HIShapeCreateWithQDRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("HIShapeCreateWithQDRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, HIShapeCreateWithQDRgn)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, HIShapeCreateWithQDRgn_FUNC);
@@ -7836,18 +7711,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIShapeReplacePathInCGContext)
 	rc = (jint)HIShapeReplacePathInCGContext(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(HIShapeReplacePathInCGContext_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("HIShapeReplacePathInCGContext"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, HIShapeReplacePathInCGContext)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, HIShapeReplacePathInCGContext_FUNC);
@@ -8398,18 +8264,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIThemeSetFill)
 	rc = (jint)HIThemeSetFill((ThemeBrush)arg0, (void *)arg1, (CGContextRef)arg2, (HIThemeOrientation)arg3);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(ThemeBrush, void *, CGContextRef, HIThemeOrientation);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(HIThemeSetFill_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("HIThemeSetFill"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((ThemeBrush)arg0, (void *)arg1, (CGContextRef)arg2, (HIThemeOrientation)arg3);
+		LOAD_FUNCTION(fp, HIThemeSetFill)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(ThemeBrush, void *, CGContextRef, HIThemeOrientation))fp)((ThemeBrush)arg0, (void *)arg1, (CGContextRef)arg2, (HIThemeOrientation)arg3);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, HIThemeSetFill_FUNC);
@@ -8427,18 +8284,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIThemeSetTextFill)
 	rc = (jint)HIThemeSetTextFill(arg0, arg1, arg2, arg3);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, jint, jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(HIThemeSetTextFill_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("HIThemeSetTextFill"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, arg2, arg3);
+		LOAD_FUNCTION(fp, HIThemeSetTextFill)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, HIThemeSetTextFill_FUNC);
@@ -9559,18 +9407,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(LSCopyAllRoleHandlersForContentType)
 	rc = (jint)LSCopyAllRoleHandlersForContentType((CFStringRef)arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(CFStringRef, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(LSCopyAllRoleHandlersForContentType_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("LSCopyAllRoleHandlersForContentType"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((CFStringRef)arg0, arg1);
+		LOAD_FUNCTION(fp, LSCopyAllRoleHandlersForContentType)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(CFStringRef, jint))fp)((CFStringRef)arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, LSCopyAllRoleHandlersForContentType_FUNC);
@@ -9930,18 +9769,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(NavDialogSetFilterTypeIdentifiers)
 	rc = (jint)NavDialogSetFilterTypeIdentifiers(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(NavDialogSetFilterTypeIdentifiers_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("NavDialogSetFilterTypeIdentifiers"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, NavDialogSetFilterTypeIdentifiers)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, NavDialogSetFilterTypeIdentifiers_FUNC);
@@ -10427,18 +10257,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(PMPrinterGetOutputResolution)
 	rc = (jint)PMPrinterGetOutputResolution((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(PMPrinter, PMPrintSettings, PMResolution *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(PMPrinterGetOutputResolution_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("PMPrinterGetOutputResolution"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2);
+		LOAD_FUNCTION(fp, PMPrinterGetOutputResolution)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(PMPrinter, PMPrintSettings, PMResolution *))fp)((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2);
 		}
 	}
 fail:
@@ -10830,18 +10651,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(PMShowPrintDialogWithOptions)
 	rc = (jint)PMShowPrintDialogWithOptions(arg0, arg1, arg2, arg3, lparg4);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, jint, jint, jint, jboolean *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(PMShowPrintDialogWithOptions_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("PMShowPrintDialogWithOptions"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, arg2, arg3, lparg4);
+		LOAD_FUNCTION(fp, PMShowPrintDialogWithOptions)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jint, jint, jboolean *))fp)(arg0, arg1, arg2, arg3, lparg4);
 		}
 	}
 fail:
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh
index 74b27cab1e..334a7d88d9 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh
@@ -18,6 +18,6 @@ export OUTPUT_DIR
 
 export MACOSX_DEPLOYMENT_TARGET=10.5
 
-export ARCHS="-arch i386 -arch ppc"
+export ARCHS="-arch i386 -arch ppc -arch x86_64"
 
 make -f make_macosx.mak $1 $2 $3 $4 $5 $6 $7 $8 $9
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml
index ad7c6228f6..6938377b9d 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project default="build_cocoa_lib_x86_and_ppc" basedir="../../..">
+<project default="build_cocoa_lib_x86_and_ppc_and_x86_64" basedir="../../..">
 
 <target name="init">
 	<eclipse.refreshLocal resource="org.eclipse.swt" depth="infinite" />
@@ -10,7 +10,7 @@
 	
 <target name="build_cocoa_lib_x86_and_ppc" depends="init">
 	<exec dir="./bin/library" executable="sh">
-		<arg line="${basedir}/bin/library/build.sh"/>
+		<arg line="${basedir}/bin/library/build32.sh"/>
 		<arg value="install"/>
 	</exec>
 	<eclipse.refreshLocal resource="org.eclipse.swt.cocoa.macosx" depth="infinite" />		
@@ -24,16 +24,12 @@
 	<eclipse.refreshLocal resource="org.eclipse.swt.cocoa.macosx" depth="infinite" />		
 </target>
 	
-<!-- 64 bit tasks -->
-<target name="build.cfiles" depends="init">
-	<java
-		fork="true"
-		dir="../org.eclipse.swt.tools"
-		classname="org.eclipse.swt.tools.internal.JNIGeneratorApp"
-		classpath="./bin:../org.eclipse.swt.tools/bin">
-		<arg value="all"/>
-	</java>
-	<antcall target="init"/>
+<target name="build_cocoa_lib_x86_and_ppc_and_x86_64" depends="init">
+	<exec dir="./bin/library" executable="sh">
+		<arg line="${basedir}/bin/library/build.sh"/>
+		<arg value="install"/>
+	</exec>
+	<eclipse.refreshLocal resource="org.eclipse.swt.cocoa.macosx" depth="infinite" />		
 </target>
 	
 <!-- Convert SWT 32 bit java and C source to 64 bit  -->
@@ -43,7 +39,7 @@
 	<replace dir="." includes="**/*.java" token="int[] /*long[]*/" value="long[] /*int[]*/"/>
 	<replace dir="." includes="**/*.java" token="float /*double*/" value="double /*float*/"/>
 	<replace dir="." includes="**/*.java" token="float[] /*double[]*/" value="double[] /*float[]*/"/>
-	<antcall target="build.cfiles"/>
+	<antcall target="init"/>
 </target>
 	
 <!-- Convert SWT 64 bit java and C source to 32 bit  -->
@@ -53,7 +49,7 @@
 	<replace dir="." includes="**/*.java" token="long[] /*int[]*/" value="int[] /*long[]*/"/>
 	<replace dir="." includes="**/*.java" token="double /*float*/" value="float /*double*/"/>
 	<replace dir="." includes="**/*.java" token="double[] /*float[]*/" value="float[] /*double[]*/"/>
-	<antcall target="build.cfiles"/>
+	<antcall target="init"/>
 </target>
 
 <target name="clean">
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build32.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build32.sh
new file mode 100755
index 0000000000..74b27cab1e
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build32.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#*******************************************************************************
+# Copyright (c) 2000, 2007 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#*******************************************************************************
+
+cd `dirname $0`
+
+OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx
+
+export OUTPUT_DIR
+
+export MACOSX_DEPLOYMENT_TARGET=10.5
+
+export ARCHS="-arch i386 -arch ppc"
+
+make -f make_macosx.mak $1 $2 $3 $4 $5 $6 $7 $8 $9
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
index adf7a21eec..5f44699b05 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
@@ -42,7 +42,7 @@ XULRUNNERCFLAGS = -c -Wall $(ARCHS) -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS)
 	-Wno-non-virtual-dtor -include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include 
 XULRUNNERLFLAGS = $(LFLAGS)
 
-all: $(SWT_LIB) $(SWTPI_LIB) $(XULRUNNER_LIB)
+all: $(SWT_LIB) $(SWTPI_LIB) #$(XULRUNNER_LIB)
 
 .c.o:
 	cc $(CFLAGS) $*.c
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
index 1b4a11892c..e0f75962dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
@@ -69,7 +69,7 @@ fail:
 
 #ifndef NO_CPSSetProcessName
 JNIEXPORT jint JNICALL OS_NATIVE(CPSSetProcessName)
-	(JNIEnv *env, jclass that, jintArray arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintArray arg0, jintLong arg1)
 {
 	jint *lparg0=NULL;
 	jint rc = 0;
@@ -85,24 +85,16 @@ fail:
 
 #ifndef NO_CloseRgn
 JNIEXPORT void JNICALL OS_NATIVE(CloseRgn)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CloseRgn_FUNC);
 /*
 	CloseRgn(arg0);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(CloseRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("CloseRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0);
+		LOAD_FUNCTION(fp, CloseRgn)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CloseRgn_FUNC);
@@ -111,24 +103,16 @@ JNIEXPORT void JNICALL OS_NATIVE(CloseRgn)
 
 #ifndef NO_CopyRgn
 JNIEXPORT void JNICALL OS_NATIVE(CopyRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, CopyRgn_FUNC);
 /*
 	CopyRgn(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(CopyRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("CopyRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, CopyRgn)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CopyRgn_FUNC);
@@ -137,7 +121,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CopyRgn)
 
 #ifndef NO_DeleteGlobalRef
 JNIEXPORT void JNICALL OS_NATIVE(DeleteGlobalRef)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, DeleteGlobalRef_FUNC);
 	(*env)->DeleteGlobalRef(env, (jobject)arg0);
@@ -147,24 +131,16 @@ JNIEXPORT void JNICALL OS_NATIVE(DeleteGlobalRef)
 
 #ifndef NO_DiffRgn
 JNIEXPORT void JNICALL OS_NATIVE(DiffRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, DiffRgn_FUNC);
 /*
 	DiffRgn(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jint, jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(DiffRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("DiffRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, DiffRgn)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, DiffRgn_FUNC);
@@ -173,24 +149,16 @@ JNIEXPORT void JNICALL OS_NATIVE(DiffRgn)
 
 #ifndef NO_DisposeRgn
 JNIEXPORT void JNICALL OS_NATIVE(DisposeRgn)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, DisposeRgn_FUNC);
 /*
 	DisposeRgn(arg0);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(DisposeRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("DisposeRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0);
+		LOAD_FUNCTION(fp, DisposeRgn)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, DisposeRgn_FUNC);
@@ -199,7 +167,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DisposeRgn)
 
 #ifndef NO_EmptyRgn
 JNIEXPORT jboolean JNICALL OS_NATIVE(EmptyRgn)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EmptyRgn_FUNC);
@@ -207,18 +175,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EmptyRgn)
 	rc = (jboolean)EmptyRgn(arg0);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jboolean (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(EmptyRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("EmptyRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, EmptyRgn)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, EmptyRgn_FUNC);
@@ -260,7 +219,7 @@ fail:
 
 #ifndef NO_GetRegionBounds
 JNIEXPORT void JNICALL OS_NATIVE(GetRegionBounds)
-	(JNIEnv *env, jclass that, jint arg0, jshortArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1)
 {
 	jshort *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, GetRegionBounds_FUNC);
@@ -269,17 +228,9 @@ JNIEXPORT void JNICALL OS_NATIVE(GetRegionBounds)
 	GetRegionBounds(arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jint, jshort *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(GetRegionBounds_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("GetRegionBounds"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, lparg1);
+		LOAD_FUNCTION(fp, GetRegionBounds)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jshort *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -297,17 +248,9 @@ JNIEXPORT void JNICALL OS_NATIVE(LineTo)
 	LineTo(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jshort, jshort);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(LineTo_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("LineTo"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, LineTo)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jshort, jshort))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, LineTo_FUNC);
@@ -323,17 +266,9 @@ JNIEXPORT void JNICALL OS_NATIVE(MoveTo)
 	MoveTo(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jshort, jshort);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(MoveTo_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("MoveTo"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, MoveTo)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jshort, jshort))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, MoveTo_FUNC);
@@ -341,24 +276,24 @@ JNIEXPORT void JNICALL OS_NATIVE(MoveTo)
 #endif
 
 #ifndef NO_NSAccessibilityPositionAttribute
-JNIEXPORT jint JNICALL OS_NATIVE(NSAccessibilityPositionAttribute)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityPositionAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityPositionAttribute_FUNC);
-	rc = (jint)NSAccessibilityPositionAttribute;
+	rc = (jintLong)NSAccessibilityPositionAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityPositionAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySizeAttribute
-JNIEXPORT jint JNICALL OS_NATIVE(NSAccessibilitySizeAttribute)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySizeAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySizeAttribute_FUNC);
-	rc = (jint)NSAccessibilitySizeAttribute;
+	rc = (jintLong)NSAccessibilitySizeAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySizeAttribute_FUNC);
 	return rc;
 }
@@ -377,187 +312,187 @@ JNIEXPORT jint JNICALL OS_NATIVE(NSAffineTransformStruct_1sizeof)
 #endif
 
 #ifndef NO_NSBackgroundColorAttributeName
-JNIEXPORT jint JNICALL OS_NATIVE(NSBackgroundColorAttributeName)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSBackgroundColorAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSBackgroundColorAttributeName_FUNC);
-	rc = (jint)NSBackgroundColorAttributeName;
+	rc = (jintLong)NSBackgroundColorAttributeName;
 	OS_NATIVE_EXIT(env, that, NSBackgroundColorAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSBaselineOffsetAttributeName
-JNIEXPORT jint JNICALL OS_NATIVE(NSBaselineOffsetAttributeName)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSBaselineOffsetAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSBaselineOffsetAttributeName_FUNC);
-	rc = (jint)NSBaselineOffsetAttributeName;
+	rc = (jintLong)NSBaselineOffsetAttributeName;
 	OS_NATIVE_EXIT(env, that, NSBaselineOffsetAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSBitsPerPixelFromDepth
-JNIEXPORT jint JNICALL OS_NATIVE(NSBitsPerPixelFromDepth)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSBitsPerPixelFromDepth)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSBitsPerPixelFromDepth_FUNC);
-	rc = (jint)NSBitsPerPixelFromDepth(arg0);
+	rc = (jintLong)NSBitsPerPixelFromDepth((NSWindowDepth)arg0);
 	OS_NATIVE_EXIT(env, that, NSBitsPerPixelFromDepth_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSCalibratedRGBColorSpace
-JNIEXPORT jint JNICALL OS_NATIVE(NSCalibratedRGBColorSpace)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSCalibratedRGBColorSpace)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSCalibratedRGBColorSpace_FUNC);
-	rc = (jint)NSCalibratedRGBColorSpace;
+	rc = (jintLong)NSCalibratedRGBColorSpace;
 	OS_NATIVE_EXIT(env, that, NSCalibratedRGBColorSpace_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSDefaultRunLoopMode
-JNIEXPORT jint JNICALL OS_NATIVE(NSDefaultRunLoopMode)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSDefaultRunLoopMode)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSDefaultRunLoopMode_FUNC);
-	rc = (jint)NSDefaultRunLoopMode;
+	rc = (jintLong)NSDefaultRunLoopMode;
 	OS_NATIVE_EXIT(env, that, NSDefaultRunLoopMode_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSDeviceRGBColorSpace
-JNIEXPORT jint JNICALL OS_NATIVE(NSDeviceRGBColorSpace)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSDeviceRGBColorSpace)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSDeviceRGBColorSpace_FUNC);
-	rc = (jint)NSDeviceRGBColorSpace;
+	rc = (jintLong)NSDeviceRGBColorSpace;
 	OS_NATIVE_EXIT(env, that, NSDeviceRGBColorSpace_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSDeviceResolution
-JNIEXPORT jint JNICALL OS_NATIVE(NSDeviceResolution)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSDeviceResolution)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSDeviceResolution_FUNC);
-	rc = (jint)NSDeviceResolution;
+	rc = (jintLong)NSDeviceResolution;
 	OS_NATIVE_EXIT(env, that, NSDeviceResolution_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSErrorFailingURLStringKey
-JNIEXPORT jint JNICALL OS_NATIVE(NSErrorFailingURLStringKey)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSErrorFailingURLStringKey)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSErrorFailingURLStringKey_FUNC);
-	rc = (jint)NSErrorFailingURLStringKey;
+	rc = (jintLong)NSErrorFailingURLStringKey;
 	OS_NATIVE_EXIT(env, that, NSErrorFailingURLStringKey_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSFileTypeForHFSTypeCode
-JNIEXPORT jint JNICALL OS_NATIVE(NSFileTypeForHFSTypeCode)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSFileTypeForHFSTypeCode)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSFileTypeForHFSTypeCode_FUNC);
-	rc = (jint)NSFileTypeForHFSTypeCode(arg0);
+	rc = (jintLong)NSFileTypeForHFSTypeCode((OSType)arg0);
 	OS_NATIVE_EXIT(env, that, NSFileTypeForHFSTypeCode_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSFilenamesPboardType
-JNIEXPORT jint JNICALL OS_NATIVE(NSFilenamesPboardType)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSFilenamesPboardType)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSFilenamesPboardType_FUNC);
-	rc = (jint)NSFilenamesPboardType;
+	rc = (jintLong)NSFilenamesPboardType;
 	OS_NATIVE_EXIT(env, that, NSFilenamesPboardType_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSFontAttributeName
-JNIEXPORT jint JNICALL OS_NATIVE(NSFontAttributeName)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSFontAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSFontAttributeName_FUNC);
-	rc = (jint)NSFontAttributeName;
+	rc = (jintLong)NSFontAttributeName;
 	OS_NATIVE_EXIT(env, that, NSFontAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSForegroundColorAttributeName
-JNIEXPORT jint JNICALL OS_NATIVE(NSForegroundColorAttributeName)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSForegroundColorAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSForegroundColorAttributeName_FUNC);
-	rc = (jint)NSForegroundColorAttributeName;
+	rc = (jintLong)NSForegroundColorAttributeName;
 	OS_NATIVE_EXIT(env, that, NSForegroundColorAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSGetSizeAndAlignment
-JNIEXPORT jint JNICALL OS_NATIVE(NSGetSizeAndAlignment)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSGetSizeAndAlignment)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2)
 {
-	jint *lparg1=NULL;
-	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong *lparg1=NULL;
+	jintLong *lparg2=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSGetSizeAndAlignment_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)NSGetSizeAndAlignment((char*)arg0, (NSUInteger*)lparg1, (NSUInteger*)lparg2);
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jintLong)NSGetSizeAndAlignment((char*)arg0, (NSUInteger*)lparg1, (NSUInteger*)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, NSGetSizeAndAlignment_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSLinkAttributeName
-JNIEXPORT jint JNICALL OS_NATIVE(NSLinkAttributeName)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSLinkAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSLinkAttributeName_FUNC);
-	rc = (jint)NSLinkAttributeName;
+	rc = (jintLong)NSLinkAttributeName;
 	OS_NATIVE_EXIT(env, that, NSLinkAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSParagraphStyleAttributeName
-JNIEXPORT jint JNICALL OS_NATIVE(NSParagraphStyleAttributeName)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSParagraphStyleAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSParagraphStyleAttributeName_FUNC);
-	rc = (jint)NSParagraphStyleAttributeName;
+	rc = (jintLong)NSParagraphStyleAttributeName;
 	OS_NATIVE_EXIT(env, that, NSParagraphStyleAttributeName_FUNC);
 	return rc;
 }
@@ -576,132 +511,132 @@ JNIEXPORT jint JNICALL OS_NATIVE(NSPoint_1sizeof)
 #endif
 
 #ifndef NO_NSPrintAllPages
-JNIEXPORT jint JNICALL OS_NATIVE(NSPrintAllPages)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintAllPages)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintAllPages_FUNC);
-	rc = (jint)NSPrintAllPages;
+	rc = (jintLong)NSPrintAllPages;
 	OS_NATIVE_EXIT(env, that, NSPrintAllPages_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintCopies
-JNIEXPORT jint JNICALL OS_NATIVE(NSPrintCopies)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintCopies)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintCopies_FUNC);
-	rc = (jint)NSPrintCopies;
+	rc = (jintLong)NSPrintCopies;
 	OS_NATIVE_EXIT(env, that, NSPrintCopies_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintFirstPage
-JNIEXPORT jint JNICALL OS_NATIVE(NSPrintFirstPage)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintFirstPage)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintFirstPage_FUNC);
-	rc = (jint)NSPrintFirstPage;
+	rc = (jintLong)NSPrintFirstPage;
 	OS_NATIVE_EXIT(env, that, NSPrintFirstPage_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintJobDisposition
-JNIEXPORT jint JNICALL OS_NATIVE(NSPrintJobDisposition)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintJobDisposition)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintJobDisposition_FUNC);
-	rc = (jint)NSPrintJobDisposition;
+	rc = (jintLong)NSPrintJobDisposition;
 	OS_NATIVE_EXIT(env, that, NSPrintJobDisposition_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintLastPage
-JNIEXPORT jint JNICALL OS_NATIVE(NSPrintLastPage)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintLastPage)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintLastPage_FUNC);
-	rc = (jint)NSPrintLastPage;
+	rc = (jintLong)NSPrintLastPage;
 	OS_NATIVE_EXIT(env, that, NSPrintLastPage_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintMustCollate
-JNIEXPORT jint JNICALL OS_NATIVE(NSPrintMustCollate)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintMustCollate)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintMustCollate_FUNC);
-	rc = (jint)NSPrintMustCollate;
+	rc = (jintLong)NSPrintMustCollate;
 	OS_NATIVE_EXIT(env, that, NSPrintMustCollate_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintPreviewJob
-JNIEXPORT jint JNICALL OS_NATIVE(NSPrintPreviewJob)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintPreviewJob)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintPreviewJob_FUNC);
-	rc = (jint)NSPrintPreviewJob;
+	rc = (jintLong)NSPrintPreviewJob;
 	OS_NATIVE_EXIT(env, that, NSPrintPreviewJob_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintSaveJob
-JNIEXPORT jint JNICALL OS_NATIVE(NSPrintSaveJob)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintSaveJob)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintSaveJob_FUNC);
-	rc = (jint)NSPrintSaveJob;
+	rc = (jintLong)NSPrintSaveJob;
 	OS_NATIVE_EXIT(env, that, NSPrintSaveJob_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintSavePath
-JNIEXPORT jint JNICALL OS_NATIVE(NSPrintSavePath)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintSavePath)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintSavePath_FUNC);
-	rc = (jint)NSPrintSavePath;
+	rc = (jintLong)NSPrintSavePath;
 	OS_NATIVE_EXIT(env, that, NSPrintSavePath_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintSpoolJob
-JNIEXPORT jint JNICALL OS_NATIVE(NSPrintSpoolJob)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintSpoolJob)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintSpoolJob_FUNC);
-	rc = (jint)NSPrintSpoolJob;
+	rc = (jintLong)NSPrintSpoolJob;
 	OS_NATIVE_EXIT(env, that, NSPrintSpoolJob_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSRTFPboardType
-JNIEXPORT jint JNICALL OS_NATIVE(NSRTFPboardType)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSRTFPboardType)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSRTFPboardType_FUNC);
-	rc = (jint)NSRTFPboardType;
+	rc = (jintLong)NSRTFPboardType;
 	OS_NATIVE_EXIT(env, that, NSRTFPboardType_FUNC);
 	return rc;
 }
@@ -732,12 +667,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(NSRect_1sizeof)
 #endif
 
 #ifndef NO_NSSearchPathForDirectoriesInDomains
-JNIEXPORT jint JNICALL OS_NATIVE(NSSearchPathForDirectoriesInDomains)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSSearchPathForDirectoriesInDomains)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSSearchPathForDirectoriesInDomains_FUNC);
-	rc = (jint)NSSearchPathForDirectoriesInDomains(arg0, arg1, arg2);
+	rc = (jintLong)NSSearchPathForDirectoriesInDomains((NSSearchPathDirectory)arg0, (NSSearchPathDomainMask)arg1, (BOOL)arg2);
 	OS_NATIVE_EXIT(env, that, NSSearchPathForDirectoriesInDomains_FUNC);
 	return rc;
 }
@@ -756,135 +691,126 @@ JNIEXPORT jint JNICALL OS_NATIVE(NSSize_1sizeof)
 #endif
 
 #ifndef NO_NSStrikethroughColorAttributeName
-JNIEXPORT jint JNICALL OS_NATIVE(NSStrikethroughColorAttributeName)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSStrikethroughColorAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSStrikethroughColorAttributeName_FUNC);
-	rc = (jint)NSStrikethroughColorAttributeName;
+	rc = (jintLong)NSStrikethroughColorAttributeName;
 	OS_NATIVE_EXIT(env, that, NSStrikethroughColorAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSStrikethroughStyleAttributeName
-JNIEXPORT jint JNICALL OS_NATIVE(NSStrikethroughStyleAttributeName)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSStrikethroughStyleAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSStrikethroughStyleAttributeName_FUNC);
-	rc = (jint)NSStrikethroughStyleAttributeName;
+	rc = (jintLong)NSStrikethroughStyleAttributeName;
 	OS_NATIVE_EXIT(env, that, NSStrikethroughStyleAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSStringPboardType
-JNIEXPORT jint JNICALL OS_NATIVE(NSStringPboardType)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSStringPboardType)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSStringPboardType_FUNC);
-	rc = (jint)NSStringPboardType;
+	rc = (jintLong)NSStringPboardType;
 	OS_NATIVE_EXIT(env, that, NSStringPboardType_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSTIFFPboardType
-JNIEXPORT jint JNICALL OS_NATIVE(NSTIFFPboardType)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSTIFFPboardType)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSTIFFPboardType_FUNC);
-	rc = (jint)NSTIFFPboardType;
+	rc = (jintLong)NSTIFFPboardType;
 	OS_NATIVE_EXIT(env, that, NSTIFFPboardType_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSTemporaryDirectory
-JNIEXPORT jint JNICALL OS_NATIVE(NSTemporaryDirectory)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSTemporaryDirectory)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSTemporaryDirectory_FUNC);
-	rc = (jint)NSTemporaryDirectory();
+	rc = (jintLong)NSTemporaryDirectory();
 	OS_NATIVE_EXIT(env, that, NSTemporaryDirectory_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSURLPboardType
-JNIEXPORT jint JNICALL OS_NATIVE(NSURLPboardType)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSURLPboardType)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSURLPboardType_FUNC);
-	rc = (jint)NSURLPboardType;
+	rc = (jintLong)NSURLPboardType;
 	OS_NATIVE_EXIT(env, that, NSURLPboardType_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSUnderlineColorAttributeName
-JNIEXPORT jint JNICALL OS_NATIVE(NSUnderlineColorAttributeName)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSUnderlineColorAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSUnderlineColorAttributeName_FUNC);
-	rc = (jint)NSUnderlineColorAttributeName;
+	rc = (jintLong)NSUnderlineColorAttributeName;
 	OS_NATIVE_EXIT(env, that, NSUnderlineColorAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSUnderlineStyleAttributeName
-JNIEXPORT jint JNICALL OS_NATIVE(NSUnderlineStyleAttributeName)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSUnderlineStyleAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSUnderlineStyleAttributeName_FUNC);
-	rc = (jint)NSUnderlineStyleAttributeName;
+	rc = (jintLong)NSUnderlineStyleAttributeName;
 	OS_NATIVE_EXIT(env, that, NSUnderlineStyleAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NewGlobalRef
-JNIEXPORT jint JNICALL OS_NATIVE(NewGlobalRef)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NewGlobalRef)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NewGlobalRef_FUNC);
-	rc = (jint)(*env)->NewGlobalRef(env, (jobject)arg0);
+	rc = (jintLong)(*env)->NewGlobalRef(env, arg0);
 	OS_NATIVE_EXIT(env, that, NewGlobalRef_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NewRgn
-JNIEXPORT jint JNICALL OS_NATIVE(NewRgn)
+JNIEXPORT jintLong JNICALL OS_NATIVE(NewRgn)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, NewRgn_FUNC);
 /*
-	rc = (jint)NewRgn();
+	rc = (jintLong)NewRgn();
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)();
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(NewRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("NewRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)();
+		LOAD_FUNCTION(fp, NewRgn)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, NewRgn_FUNC);
@@ -894,24 +820,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(NewRgn)
 
 #ifndef NO_OffsetRgn
 JNIEXPORT void JNICALL OS_NATIVE(OffsetRgn)
-	(JNIEnv *env, jclass that, jint arg0, jshort arg1, jshort arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jshort arg1, jshort arg2)
 {
 	OS_NATIVE_ENTER(env, that, OffsetRgn_FUNC);
 /*
 	OffsetRgn(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jint, jshort, jshort);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(OffsetRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("OffsetRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, OffsetRgn)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jshort, jshort))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, OffsetRgn_FUNC);
@@ -927,17 +845,9 @@ JNIEXPORT void JNICALL OS_NATIVE(OpenRgn)
 	OpenRgn();
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)();
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(OpenRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("OpenRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)();
+		LOAD_FUNCTION(fp, OpenRgn)
+		if (fp) {
+			((void (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, OpenRgn_FUNC);
@@ -946,7 +856,7 @@ JNIEXPORT void JNICALL OS_NATIVE(OpenRgn)
 
 #ifndef NO_PtInRgn
 JNIEXPORT jboolean JNICALL OS_NATIVE(PtInRgn)
-	(JNIEnv *env, jclass that, jshortArray arg0, jint arg1)
+	(JNIEnv *env, jclass that, jshortArray arg0, jintLong arg1)
 {
 	jshort *lparg0=NULL;
 	jboolean rc = 0;
@@ -956,18 +866,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PtInRgn)
 	rc = (jboolean)PtInRgn(lparg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jboolean (*FPTR)(jshort *, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(PtInRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("PtInRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)(lparg0, arg1);
+		LOAD_FUNCTION(fp, PtInRgn)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jshort *, jintLong))fp)(lparg0, arg1);
 		}
 	}
 fail:
@@ -979,7 +880,7 @@ fail:
 
 #ifndef NO_QDRegionToRects
 JNIEXPORT jint JNICALL OS_NATIVE(QDRegionToRects)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, QDRegionToRects_FUNC);
@@ -987,18 +888,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(QDRegionToRects)
 	rc = (jint)QDRegionToRects(arg0, arg1, arg2, arg3);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jint (*FPTR)(jint, jint, jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(QDRegionToRects_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("QDRegionToRects"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, arg2, arg3);
+		LOAD_FUNCTION(fp, QDRegionToRects)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, QDRegionToRects_FUNC);
@@ -1008,7 +900,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(QDRegionToRects)
 
 #ifndef NO_RectInRgn
 JNIEXPORT jboolean JNICALL OS_NATIVE(RectInRgn)
-	(JNIEnv *env, jclass that, jshortArray arg0, jint arg1)
+	(JNIEnv *env, jclass that, jshortArray arg0, jintLong arg1)
 {
 	jshort *lparg0=NULL;
 	jboolean rc = 0;
@@ -1018,18 +910,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RectInRgn)
 	rc = (jboolean)RectInRgn(lparg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef jboolean (*FPTR)(jshort *, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(RectInRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("RectInRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)(lparg0, arg1);
+		LOAD_FUNCTION(fp, RectInRgn)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jshort *, jintLong))fp)(lparg0, arg1);
 		}
 	}
 fail:
@@ -1041,7 +924,7 @@ fail:
 
 #ifndef NO_RectRgn
 JNIEXPORT void JNICALL OS_NATIVE(RectRgn)
-	(JNIEnv *env, jclass that, jint arg0, jshortArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1)
 {
 	jshort *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, RectRgn_FUNC);
@@ -1050,17 +933,9 @@ JNIEXPORT void JNICALL OS_NATIVE(RectRgn)
 	RectRgn(arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jint, jshort *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(RectRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("RectRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, lparg1);
+		LOAD_FUNCTION(fp, RectRgn)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jshort *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -1071,24 +946,16 @@ fail:
 
 #ifndef NO_SectRgn
 JNIEXPORT void JNICALL OS_NATIVE(SectRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, SectRgn_FUNC);
 /*
 	SectRgn(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jint, jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(SectRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("SectRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, SectRgn)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, SectRgn_FUNC);
@@ -1122,17 +989,9 @@ JNIEXPORT void JNICALL OS_NATIVE(SetRect)
 	SetRect(lparg0, arg1, arg2, arg3, arg4);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jshort *, jshort, jshort, jshort, jshort);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(SetRect_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("SetRect"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(lparg0, arg1, arg2, arg3, arg4);
+		LOAD_FUNCTION(fp, SetRect)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jshort *, jshort, jshort, jshort, jshort))fp)(lparg0, arg1, arg2, arg3, arg4);
 		}
 	}
 fail:
@@ -1159,24 +1018,16 @@ fail:
 
 #ifndef NO_UnionRgn
 JNIEXPORT void JNICALL OS_NATIVE(UnionRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, UnionRgn_FUNC);
 /*
 	UnionRgn(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jint, jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(UnionRgn_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("UnionRgn"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, UnionRgn)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, UnionRgn_FUNC);
@@ -1185,7 +1036,7 @@ JNIEXPORT void JNICALL OS_NATIVE(UnionRgn)
 
 #ifndef NO_class_1addIvar
 JNIEXPORT jboolean JNICALL OS_NATIVE(class_1addIvar)
-	(JNIEnv *env, jclass that, jint arg0, jstring arg1, jint arg2, jbyte arg3, jstring arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jstring arg1, jintLong arg2, jbyte arg3, jstring arg4)
 {
 	const char *lparg1= NULL;
 	const char *lparg4= NULL;
@@ -1193,7 +1044,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(class_1addIvar)
 	OS_NATIVE_ENTER(env, that, class_1addIvar_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetStringUTFChars(env, arg1, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetStringUTFChars(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jboolean)class_addIvar((Class)arg0, (const char *)lparg1, (size_t)arg2, arg3, (const char *)lparg4);
+	rc = (jboolean)class_addIvar((Class)arg0, lparg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseStringUTFChars(env, arg4, lparg4);
 	if (arg1 && lparg1) (*env)->ReleaseStringUTFChars(env, arg1, lparg1);
@@ -1204,13 +1055,13 @@ fail:
 
 #ifndef NO_class_1addMethod
 JNIEXPORT jboolean JNICALL OS_NATIVE(class_1addMethod)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jstring arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jstring arg3)
 {
 	const char *lparg3= NULL;
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, class_1addMethod_FUNC);
 	if (arg3) if ((lparg3 = (*env)->GetStringUTFChars(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jboolean)class_addMethod((Class)arg0, (SEL)arg1, (IMP)arg2, (const char *)lparg3);
+	rc = (jboolean)class_addMethod((Class)arg0, (SEL)arg1, (IMP)arg2, lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseStringUTFChars(env, arg3, lparg3);
 	OS_NATIVE_EXIT(env, that, class_1addMethod_FUNC);
@@ -1220,7 +1071,7 @@ fail:
 
 #ifndef NO_class_1addProtocol
 JNIEXPORT jboolean JNICALL OS_NATIVE(class_1addProtocol)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, class_1addProtocol_FUNC);
@@ -1251,256 +1102,424 @@ JNIEXPORT void JNICALL OS_NATIVE(instrumentObjcMessageSends)
 	instrumentObjcMessageSends(arg0);
 */
 	{
-		static int initialized = 0;
-		static CFBundleRef bundle = NULL;
-		typedef void (*FPTR)(jboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!bundle) bundle = CFBundleGetBundleWithIdentifier(CFSTR(instrumentObjcMessageSends_LIB));
-			if (bundle) fptr = (FPTR)CFBundleGetFunctionPointerForName(bundle, CFSTR("instrumentObjcMessageSends"));
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0);
+		LOAD_FUNCTION(fp, instrumentObjcMessageSends)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jboolean))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, instrumentObjcMessageSends_FUNC);
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_CGPoint_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_CGPoint_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	CGPoint _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGPoint_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getCGPointFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setCGPointFields(env, arg1, lparg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGPoint_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_CGRect_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_CGRect_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	CGRect _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGRect_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getCGRectFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setCGRectFields(env, arg1, lparg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGRect_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_CGSize_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_CGSize_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	CGSize _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGSize_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getCGSizeFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setCGSizeFields(env, arg1, lparg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGSize_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	NSAffineTransformStruct _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNSAffineTransformStructFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setNSAffineTransformStructFields(env, arg1, lparg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	NSPoint _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNSPointFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setNSPointFields(env, arg1, lparg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	NSRange _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNSRangeFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setNSRangeFields(env, arg1, lparg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	NSRect _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNSRectFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setNSRectFields(env, arg1, lparg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	NSSize _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNSSizeFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setNSSizeFields(env, arg1, lparg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	CGPoint _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II_FUNC);
-	if (arg0) if ((lparg0 = getCGPointFields(env, arg0, &_arg0)) == NULL) goto fail;
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ_FUNC);
+#endif
+	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setCGPointFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	CGRect _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II_FUNC);
-	if (arg0) if ((lparg0 = getCGRectFields(env, arg0, &_arg0)) == NULL) goto fail;
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ_FUNC);
+#endif
+	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setCGRectFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	CGSize _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II_FUNC);
-	if (arg0) if ((lparg0 = getCGSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ_FUNC);
+#endif
+	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setCGSizeFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	NSAffineTransformStruct _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_FUNC);
-	if (arg0) if ((lparg0 = getNSAffineTransformStructFields(env, arg0, &_arg0)) == NULL) goto fail;
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC);
+#endif
+	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNSAffineTransformStructFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	NSPoint _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC);
-	if (arg0) if ((lparg0 = getNSPointFields(env, arg0, &_arg0)) == NULL) goto fail;
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC);
+#endif
+	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNSPointFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	NSRange _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_FUNC);
-	if (arg0) if ((lparg0 = getNSRangeFields(env, arg0, &_arg0)) == NULL) goto fail;
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC);
+#endif
+	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNSRangeFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	NSRect _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
-	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC);
+#endif
+	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	NSSize _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_FUNC);
-	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC);
+#endif
+	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO_objc_1allocateClassPair
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1allocateClassPair)
-	(JNIEnv *env, jclass that, jint arg0, jstring arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1allocateClassPair)
+	(JNIEnv *env, jclass that, jintLong arg0, jstring arg1, jintLong arg2)
 {
 	const char *lparg1= NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1allocateClassPair_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetStringUTFChars(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)objc_allocateClassPair((Class)arg0, (const char *)lparg1, (size_t)arg2);
+	rc = (jintLong)objc_allocateClassPair((Class)arg0, lparg1, arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseStringUTFChars(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, objc_1allocateClassPair_FUNC);
@@ -1509,14 +1528,14 @@ fail:
 #endif
 
 #ifndef NO_objc_1getClass
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1getClass)
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1getClass)
 	(JNIEnv *env, jclass that, jstring arg0)
 {
 	const char *lparg0= NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1getClass_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetStringUTFChars(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)objc_getClass((const char *)lparg0);
+	rc = (jintLong)objc_getClass(lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseStringUTFChars(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, objc_1getClass_FUNC);
@@ -1525,14 +1544,14 @@ fail:
 #endif
 
 #ifndef NO_objc_1getProtocol
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1getProtocol)
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1getProtocol)
 	(JNIEnv *env, jclass that, jstring arg0)
 {
 	const char *lparg0= NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1getProtocol_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetStringUTFChars(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)objc_getProtocol(lparg0);
+	rc = (jintLong)objc_getProtocol(lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseStringUTFChars(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, objc_1getProtocol_FUNC);
@@ -1541,14 +1560,14 @@ fail:
 #endif
 
 #ifndef NO_objc_1lookUpClass
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1lookUpClass)
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1lookUpClass)
 	(JNIEnv *env, jclass that, jstring arg0)
 {
 	const char *lparg0= NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1lookUpClass_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetStringUTFChars(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)objc_lookUpClass((const char *)lparg0);
+	rc = (jintLong)objc_lookUpClass(lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseStringUTFChars(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, objc_1lookUpClass_FUNC);
@@ -1556,38 +1575,71 @@ fail:
 }
 #endif
 
-#ifndef NO_objc_1msgSend__II
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO_objc_1msgSend__II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_FUNC);
-	rc = (jint)((jint (*)(id, SEL))objc_msgSend)((id)arg0, (SEL)arg1);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong))objc_msgSend)(arg0, arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IID
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IID)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jdouble arg2)
+#if (!defined(NO_objc_1msgSend__IID) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJD) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IID)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IID_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jdouble))objc_msgSend)((id)arg0, (SEL)arg1, arg2);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJD_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jdouble))objc_msgSend)(arg0, arg1, arg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IID_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJD_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIDIIIZ
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIDIIIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jdouble arg2, jint arg3, jint arg4, jint arg5, jboolean arg6)
+#if (!defined(NO_objc_1msgSend__IIDIIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJDJJJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIDIIIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jintLong arg3, jintLong arg4, jintLong arg5, jboolean arg6)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJDJJJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jintLong arg3, jintLong arg4, jintLong arg5, jboolean arg6)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIDIIIZ_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jdouble, jint, jint, jint, jboolean))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3, arg4, arg5, arg6);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJDJJJZ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jdouble, jintLong, jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIDIIIZ_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJDJJJZ_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -1598,825 +1650,1408 @@ JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIF)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIF_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jfloat))objc_msgSend)((id)arg0, (SEL)arg1, arg2);
+	rc = (jint)((jint (*)(jint, jint, jfloat))objc_msgSend)(arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIF_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIFF
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIFF)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2, jfloat arg3)
+#if (!defined(NO_objc_1msgSend__IIFF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJDD) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIFF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jfloatDouble arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJDD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jfloatDouble arg3)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIFF_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jfloat, jfloat))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJDD_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jfloatDouble, jfloatDouble))objc_msgSend)(arg0, arg1, arg2, arg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIFF_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJDD_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIFFFF
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIFFFF)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5)
+#if (!defined(NO_objc_1msgSend__IIFFFF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJDDDD) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIFFFF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJDDDD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIFFFF_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jfloat, jfloat, jfloat, jfloat))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3, arg4, arg5);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJDDDD_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jfloatDouble, jfloatDouble, jfloatDouble, jfloatDouble))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIFFFF_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJDDDD_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__III
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_objc_1msgSend__III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__III_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jint))objc_msgSend)((id)arg0, (SEL)arg1, arg2);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIIF
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIIF)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jfloat arg3)
+#if (!defined(NO_objc_1msgSend__IIIF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJD) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jfloatDouble arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jfloatDouble arg3)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIF_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jint, jfloat))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJD_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jfloatDouble))objc_msgSend)(arg0, arg1, arg2, arg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIF_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJD_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIII
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_objc_1msgSend__IIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIII_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jint, jint))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIIII
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO_objc_1msgSend__IIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIII_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jint, jint, jint))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3, arg4);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIIIII
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO_objc_1msgSend__IIIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIII_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jint, jint, jint, jint))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3, arg4, arg5);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIIIIII
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#if (!defined(NO_objc_1msgSend__IIIIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIIII_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jint, jint, jint, jint, jint))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3, arg4, arg5, arg6);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIIIIIIII
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIIIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+#if (!defined(NO_objc_1msgSend__IIIIIIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7, jintLong arg8)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7, jintLong arg8)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIIIIII_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jint, jint, jint, jint, jint, jint, jint))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJJJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIIIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIIIIIIZZIII
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIIIIIIZZIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jboolean arg7, jboolean arg8, jint arg9, jint arg10, jint arg11)
+#if (!defined(NO_objc_1msgSend__IIIIIIIZZIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJJJZZJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIIIIZZIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jboolean arg7, jboolean arg8, jintLong arg9, jintLong arg10, jintLong arg11)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJZZJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jboolean arg7, jboolean arg8, jintLong arg9, jintLong arg10, jintLong arg11)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIIIIZZIII_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jint, jint, jint, jint, jint, jboolean, jboolean, jint, jint, jint))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJJJZZJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jboolean, jboolean, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIIIIZZIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJJJZZJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIIIIIIZZIIII
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIIIIIIZZIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jboolean arg7, jboolean arg8, jint arg9, jint arg10, jint arg11, jint arg12)
+#if (!defined(NO_objc_1msgSend__IIIIIIIZZIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJJJZZJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIIIIZZIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jboolean arg7, jboolean arg8, jintLong arg9, jintLong arg10, jintLong arg11, jintLong arg12)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJZZJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jboolean arg7, jboolean arg8, jintLong arg9, jintLong arg10, jintLong arg11, jintLong arg12)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIIIIZZIIII_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jint, jint, jint, jint, jint, jboolean, jboolean, jint, jint, jint, jint))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJJJZZJJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jboolean, jboolean, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIIIIZZIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJJJZZJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIIIIZ
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIIIIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jboolean arg5)
+#if (!defined(NO_objc_1msgSend__IIIIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jboolean arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jboolean arg5)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIIZ_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jint, jint, jint, jboolean))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3, arg4, arg5);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJZ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIIZ_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
+#if (!defined(NO_objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4)
+#endif
 {
 	NSRange _arg4, *lparg4=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#endif
 	if (arg4) if ((lparg4 = getNSRangeFields(env, arg4, &_arg4)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jint, jint, NSRange))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3, *lparg4);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, NSRange))objc_msgSend)(arg0, arg1, arg2, arg3, *lparg4);
 fail:
 	if (arg4 && lparg4) setNSRangeFields(env, arg4, lparg4);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIIIZ
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIIIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4)
+#if (!defined(NO_objc_1msgSend__IIIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIZ_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jint, jint, jboolean))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3, arg4);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJZ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIZ_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	NSPoint _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jint, NSPoint))objc_msgSend)((id)arg0, (SEL)arg1, arg2, *lparg3);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, NSPoint))objc_msgSend)(arg0, arg1, arg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jdouble arg5, jint arg6, jint arg7, jshort arg8, jint arg9, jint arg10)
+#if (!defined(NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4, jdouble arg5, jintLong arg6, jintLong arg7, jshort arg8, jintLong arg9, jintLong arg10)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4, jdouble arg5, jintLong arg6, jintLong arg7, jshort arg8, jintLong arg9, jintLong arg10)
+#endif
 {
 	NSPoint _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jint, NSPoint, jint, jdouble, jint, jint, jshort, jint, jint))objc_msgSend)((id)arg0, (SEL)arg1, arg2, *lparg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, NSPoint, jintLong, jdouble, jintLong, jintLong, jshort, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, *lparg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	NSRange _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getNSRangeFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jint, NSRange))objc_msgSend)((id)arg0, (SEL)arg1, arg2, *lparg3);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, NSRange))objc_msgSend)(arg0, arg1, arg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSRangeFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIIZ
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3)
+#if (!defined(NO_objc_1msgSend__IIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIZ_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jint, jboolean))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJZ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, arg2, arg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIZ_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	NSAffineTransformStruct _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSAffineTransformStructFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSAffineTransformStruct))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSAffineTransformStruct))objc_msgSend)(arg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSAffineTransformStructFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	NSPoint _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSPoint))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint))objc_msgSend)(arg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jfloat arg3, jfloat arg4, jfloat arg5)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5)
+#endif
 {
 	NSPoint _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSPoint, jfloat, jfloat, jfloat))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, arg3, arg4, arg5);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, jfloatDouble, jfloatDouble, jfloatDouble))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5);
 fail:
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jfloat arg3, jfloat arg4, jfloat arg5, jboolean arg6)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5, jboolean arg6)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5, jboolean arg6)
+#endif
 {
 	NSPoint _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSPoint, jfloat, jfloat, jfloat, jboolean))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, arg3, arg4, arg5, arg6);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, jfloatDouble, jfloatDouble, jfloatDouble, jboolean))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5, arg6);
 fail:
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jfloatArray arg4)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jfloatDoubleArray arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jfloatDoubleArray arg4)
+#endif
 {
 	NSPoint _arg2, *lparg2=NULL;
-	jfloat *lparg4=NULL;
-	jint rc = 0;
+	jfloatDouble *lparg4=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetFloatArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSPoint, jint, jfloat *))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, arg3, lparg4);
+	if (arg4) if ((lparg4 = (*env)->GetFloatDoubleArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, jintLong, jfloatDouble *))objc_msgSend)(arg0, arg1, *lparg2, arg3, lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseFloatArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseFloatDoubleArrayElements(env, arg4, lparg4, 0);
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jint arg4)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4)
+#endif
 {
 	NSPoint _arg2, *lparg2=NULL;
 	NSPoint _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSPoint, NSPoint, jint))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, *lparg3, arg4);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, NSPoint, jintLong))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jobject arg4)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jobject arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jobject arg4)
+#endif
 {
 	NSPoint _arg2, *lparg2=NULL;
 	NSPoint _arg3, *lparg3=NULL;
 	NSPoint _arg4, *lparg4=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getNSPointFields(env, arg4, &_arg4)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSPoint, NSPoint, NSPoint))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, *lparg3, *lparg4);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, NSPoint, NSPoint))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, *lparg4);
 fail:
 	if (arg4 && lparg4) setNSPointFields(env, arg4, lparg4);
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jint arg4, jfloat arg5)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4, jfloatDouble arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4, jfloatDouble arg5)
+#endif
 {
 	NSPoint _arg2, *lparg2=NULL;
 	NSRect _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSPoint, NSRect, jint, jfloat))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, *lparg3, arg4, arg5);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, NSRect, jintLong, jfloatDouble))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, arg4, arg5);
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	NSRange _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRangeFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRange))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRange))objc_msgSend)(arg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSRangeFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
+#endif
 {
 	NSRange _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRangeFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRange, jint))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, arg3);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRange, jintLong))objc_msgSend)(arg0, arg1, *lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setNSRangeFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
+#endif
 {
 	NSRange _arg2, *lparg2=NULL;
 	NSPoint _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRangeFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRange, NSPoint))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, *lparg3);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRange, NSPoint))objc_msgSend)(arg0, arg1, *lparg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSRangeFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	NSRect _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect))objc_msgSend)(arg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jfloat arg3)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3)
+#endif
 {
 	NSRect _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect, jfloat))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, arg3);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jfloatDouble))objc_msgSend)(arg0, arg1, *lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jfloat arg3, jfloat arg4)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3, jfloatDouble arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3, jfloatDouble arg4)
+#endif
 {
 	NSRect _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect, jfloat, jfloat))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, arg3, arg4);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jfloatDouble, jfloatDouble))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
+#endif
 {
 	NSRect _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect, jint))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, arg3);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jintLong))objc_msgSend)(arg0, arg1, *lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jint arg4)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4)
+#endif
 {
 	NSRect _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect, jint, jint))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, arg3, arg4);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jintLong, jintLong))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jint arg4, jboolean arg5)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4, jboolean arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4, jboolean arg5)
+#endif
 {
 	NSRect _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect, jint, jint, jboolean))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, arg3, arg4, arg5);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jint arg4, jboolean arg5, jint arg6)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4, jboolean arg5, jintLong arg6)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4, jboolean arg5, jintLong arg6)
+#endif
 {
 	NSRect _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect, jint, jint, jboolean, jint))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, arg3, arg4, arg5, arg6);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jintLong, jintLong, jboolean, jintLong))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5, arg6);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jboolean arg4, jint arg5)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jboolean arg4, jintLong arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jboolean arg4, jintLong arg5)
+#endif
 {
 	NSRect _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect, jint, jboolean, jint))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, arg3, arg4, arg5);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jintLong, jboolean, jintLong))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
+#endif
 {
 	NSRect _arg2, *lparg2=NULL;
 	NSPoint _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect, NSPoint))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, *lparg3);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, NSPoint))objc_msgSend)(arg0, arg1, *lparg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jobject arg4)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jobject arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jobject arg4)
+#endif
 {
 	NSRect _arg2, *lparg2=NULL;
 	NSRange _arg3, *lparg3=NULL;
 	NSRect _arg4, *lparg4=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRangeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getNSRectFields(env, arg4, &_arg4)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect, NSRange, NSRect))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, *lparg3, *lparg4);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, NSRange, NSRect))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, *lparg4);
 fail:
 	if (arg4 && lparg4) setNSRectFields(env, arg4, lparg4);
 	if (arg3 && lparg3) setNSRangeFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jint arg4, jfloat arg5)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4, jfloatDouble arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4, jfloatDouble arg5)
+#endif
 {
 	NSRect _arg2, *lparg2=NULL;
 	NSRect _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect, NSRect, jint, jfloat))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, *lparg3, arg4, arg5);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, NSRect, jintLong, jfloatDouble))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, arg4, arg5);
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jboolean arg3)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jboolean arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jboolean arg3)
+#endif
 {
 	NSRect _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect, jboolean))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2, arg3);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jboolean))objc_msgSend)(arg0, arg1, *lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	NSSize _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getNSSizeFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSSize))objc_msgSend)((id)arg0, (SEL)arg1, *lparg2);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSSize))objc_msgSend)(arg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSSizeFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIZ
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+#if (!defined(NO_objc_1msgSend__IIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIZ_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jboolean))objc_msgSend)((id)arg0, (SEL)arg1, arg2);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJZ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, arg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIZ_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIZI
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIZI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jint arg3)
+#if (!defined(NO_objc_1msgSend__IIZI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJZJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jintLong arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJZJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jintLong arg3)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIZI_FUNC);
-	rc = (jint)((jint (*)(id, SEL, jboolean, jint))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJZJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jboolean, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIZI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJZJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__II_3B
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__II_3B)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2)
+#if (!defined(NO_objc_1msgSend__II_3B) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3B)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3B)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2)
+#endif
 {
 	jbyte *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3B_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3B_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jbyte *))objc_msgSend)((id)arg0, (SEL)arg1, lparg2);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jbyte *))objc_msgSend)(arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3B_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3B_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__II_3BI
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__II_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+#if (!defined(NO_objc_1msgSend__II_3BI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3BJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jintLong arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jintLong arg3)
+#endif
 {
 	jbyte *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3BI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3BJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jbyte *, jint))objc_msgSend)((id)arg0, (SEL)arg1, lparg2, arg3);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jbyte *, jintLong))objc_msgSend)(arg0, arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3BI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3BJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__II_3C
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__II_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2)
+#if (!defined(NO_objc_1msgSend__II_3C) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3C) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3C)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3C)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2)
+#endif
 {
 	jchar *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3C_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3C_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)objc_msgSend((id)arg0, (SEL)arg1, lparg2);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jchar *))objc_msgSend)(arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3C_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__II_3CI
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__II_3CI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3)
+#if (!defined(NO_objc_1msgSend__II_3CI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3CJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3CI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jintLong arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3CJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jintLong arg3)
+#endif
 {
 	jchar *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3CI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3CJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)objc_msgSend((id)arg0, (SEL)arg1, lparg2, arg3);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jchar *, jintLong))objc_msgSend)(arg0, arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3CI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3CJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jobject arg3)
+#if (!defined(NO_objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jobject arg3)
+#endif
 {
 	jchar *lparg2=NULL;
 	NSRange _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRangeFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jchar *, NSRange))objc_msgSend)((id)arg0, (SEL)arg1, lparg2, *lparg3);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jchar *, NSRange))objc_msgSend)(arg0, arg1, lparg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSRangeFields(env, arg3, lparg3);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__II_3F
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__II_3F)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloatArray arg2)
+#if (!defined(NO_objc_1msgSend__II_3F) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3D) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3F)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDoubleArray arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3D)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDoubleArray arg2)
+#endif
 {
-	jfloat *lparg2=NULL;
-	jint rc = 0;
+	jfloatDouble *lparg2=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3F_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetFloatArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jfloat *))objc_msgSend)((id)arg0, (SEL)arg1, lparg2);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3D_FUNC);
+#endif
+	if (arg2) if ((lparg2 = (*env)->GetFloatDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jfloatDouble *))objc_msgSend)(arg0, arg1, lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseFloatArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseFloatDoubleArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3F_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3D_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__II_3FIF
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__II_3FIF)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloatArray arg2, jint arg3, jfloat arg4)
+#if (!defined(NO_objc_1msgSend__II_3FIF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3DJD) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3FIF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDoubleArray arg2, jintLong arg3, jfloatDouble arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3DJD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDoubleArray arg2, jintLong arg3, jfloatDouble arg4)
+#endif
 {
-	jfloat *lparg2=NULL;
-	jint rc = 0;
+	jfloatDouble *lparg2=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3FIF_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetFloatArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jfloat *, jint, jfloat))objc_msgSend)((id)arg0, (SEL)arg1, lparg2, arg3, arg4);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3DJD_FUNC);
+#endif
+	if (arg2) if ((lparg2 = (*env)->GetFloatDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jfloatDouble *, jintLong, jfloatDouble))objc_msgSend)(arg0, arg1, lparg2, arg3, arg4);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseFloatArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseFloatDoubleArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3FIF_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3DJD_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__II_3I
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__II_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+#if (!defined(NO_objc_1msgSend__II_3I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2)
+#endif
 {
 	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jint *))objc_msgSend)((id)arg0, (SEL)arg1, lparg2);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jint *))objc_msgSend)(arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__II_3III
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__II_3III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3, jint arg4)
+#if (!defined(NO_objc_1msgSend__II_3III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3JJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLong arg3, jintLong arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3JJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLong arg3, jintLong arg4)
+#endif
 {
-	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong *lparg2=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3III_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jint *, jint, jint))objc_msgSend)((id)arg0, (SEL)arg1, lparg2, arg3, arg4);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3JJJ_FUNC);
+#endif
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong *, jintLong, jintLong))objc_msgSend)(arg0, arg1, lparg2, arg3, arg4);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3JJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -2427,7 +3062,7 @@ JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJFD)
 {
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJFD_FUNC);
-	rc = (jlong)((jlong (*)(id, SEL, jfloat, jdouble))objc_msgSend)((id)arg0, (SEL)arg1, arg2, arg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, jfloat, jdouble))objc_msgSend)(arg0, arg1, arg2, arg3);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJFD_FUNC);
 	return rc;
 }
@@ -2439,504 +3074,801 @@ JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJI)
 {
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJI_FUNC);
-	rc = (jlong)((jlong (*)(id, SEL, jint))objc_msgSend)((id)arg0, (SEL)arg1, arg2);
+	rc = (jlong)((jlong (*)(jlong, jlong, jint))objc_msgSend)(arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJI_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
 	struct objc_super _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL))objc_msgSendSuper)((id)lparg0, (SEL)arg1);
+	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong))objc_msgSendSuper)(lparg0, arg1);
 fail:
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	struct objc_super _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jint))objc_msgSendSuper)((id)lparg0, (SEL)arg1, arg2);
+	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, jintLong))objc_msgSendSuper)(lparg0, arg1, arg2);
 fail:
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4, jboolean arg5)
+#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jboolean arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jboolean arg5)
+#endif
 {
 	struct objc_super _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, jint, jint, jint, jboolean))objc_msgSendSuper)((id)lparg0, (SEL)arg1, arg2, arg3, arg4, arg5);
+	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, jintLong, jintLong, jintLong, jboolean))objc_msgSendSuper)(lparg0, arg1, arg2, arg3, arg4, arg5);
 fail:
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jobject arg2)
+#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSPoint _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSPoint))objc_msgSendSuper)((id)lparg0, (SEL)arg1, *lparg2);
+	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, NSPoint))objc_msgSendSuper)(lparg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jobject arg2)
+#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSRect _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSRect))objc_msgSendSuper)((id)lparg0, (SEL)arg1, *lparg2);
+	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, NSRect))objc_msgSendSuper)(lparg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jobject arg2)
+#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSSize _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getNSSizeFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (*)(id, SEL, NSSize))objc_msgSendSuper)((id)lparg0, (SEL)arg1, *lparg2);
+	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, NSSize))objc_msgSendSuper)(lparg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSSizeFields(env, arg2, lparg2);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1fpret__II
-JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO_objc_1msgSend_1fpret__II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1fpret__JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
 {
 	jdouble rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1fpret__II_FUNC);
-	rc = (jdouble)((jdouble (*)(id, SEL))objc_msgSend_fpret)((id)arg0, (SEL)arg1);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1fpret__JJ_FUNC);
+#endif
+	rc = (jdouble)((jdouble (*)(jintLong, jintLong))objc_msgSend_fpret)(arg0, arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1fpret__II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1fpret__JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1fpret__III
-JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_objc_1msgSend_1fpret__III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1fpret__JJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__JJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	jdouble rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1fpret__III_FUNC);
-	rc = (jdouble)((jdouble (*)(id, SEL, jint))objc_msgSend_fpret)((id)arg0, (SEL)arg1, arg2);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1fpret__JJJ_FUNC);
+#endif
+	rc = (jdouble)((jdouble (*)(jintLong, jintLong, jintLong))objc_msgSend_fpret)(arg0, arg1, arg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1fpret__III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1fpret__JJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1fpret__IIII
-JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__IIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_objc_1msgSend_1fpret__IIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1fpret__JJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__JJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#endif
 {
 	jdouble rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1fpret__IIII_FUNC);
-	rc = (jdouble)((jdouble (*)(id, SEL, jint, jint))objc_msgSend_fpret)((id)arg0, (SEL)arg1, arg2, arg3);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1fpret__JJJJ_FUNC);
+#endif
+	rc = (jdouble)((jdouble (*)(jintLong, jintLong, jintLong, jintLong))objc_msgSend_fpret)(arg0, arg1, arg2, arg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1fpret__IIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1fpret__JJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	NSAffineTransformStruct _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSAffineTransformStructFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSAffineTransformStruct *, id, SEL))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2);
+		((void (*)(NSAffineTransformStruct *, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2);
 	} else {
-		*lparg0 = (*(NSAffineTransformStruct (*)(id, SEL))objc_msgSend)((id)arg1, (SEL)arg2);
+		*lparg0 = (*(NSAffineTransformStruct (*)(jintLong, jintLong))objc_msgSend)(arg1, arg2);
 	}
 fail:
 	if (arg0 && lparg0) setNSAffineTransformStructFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	NSPoint _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSPointFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSPoint *, id, SEL))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2);
+		((void (*)(NSPoint *, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2);
 	} else {
-		*lparg0 = (*(NSPoint (*)(id, SEL))objc_msgSend)((id)arg1, (SEL)arg2);
+		*lparg0 = (*(NSPoint (*)(jintLong, jintLong))objc_msgSend)(arg1, arg2);
 	}
 fail:
 	if (arg0 && lparg0) setNSPointFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#endif
 {
 	NSPoint _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSPointFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSPoint *, id, SEL, jint))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, arg3);
+		((void (*)(NSPoint *, jintLong, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3);
 	} else {
-		*lparg0 = (*(NSPoint (*)(id, SEL, jint))objc_msgSend)((id)arg1, (SEL)arg2, arg3);
+		*lparg0 = (*(NSPoint (*)(jintLong, jintLong, jintLong))objc_msgSend)(arg1, arg2, arg3);
 	}
 fail:
 	if (arg0 && lparg0) setNSPointFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	NSPoint _arg0, *lparg0=NULL;
 	NSPoint _arg3, *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSPointFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSPoint *, id, SEL, NSPoint))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, *lparg3);
+		((void (*)(NSPoint *, jintLong, jintLong, NSPoint))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
 	} else {
-		*lparg0 = (*(NSPoint (*)(id, SEL, NSPoint))objc_msgSend)((id)arg1, (SEL)arg2, *lparg3);
+		*lparg0 = (*(NSPoint (*)(jintLong, jintLong, NSPoint))objc_msgSend)(arg1, arg2, *lparg3);
 	}
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSPointFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
+#endif
 {
 	NSPoint _arg0, *lparg0=NULL;
 	NSPoint _arg3, *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSPointFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSPoint *, id, SEL, NSPoint, jint))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, *lparg3, arg4);
+		((void (*)(NSPoint *, jintLong, jintLong, NSPoint, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
 	} else {
-		*lparg0 = (*(NSPoint (*)(id, SEL, NSPoint, jint))objc_msgSend)((id)arg1, (SEL)arg2, *lparg3, arg4);
+		*lparg0 = (*(NSPoint (*)(jintLong, jintLong, NSPoint, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
 	}
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSPointFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	NSRange _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSRangeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSRange *, id, SEL))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2);
+		((void (*)(NSRange *, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2);
 	} else {
-		*lparg0 = (*(NSRange (*)(id, SEL))objc_msgSend)((id)arg1, (SEL)arg2);
+		*lparg0 = (*(NSRange (*)(jintLong, jintLong))objc_msgSend)(arg1, arg2);
 	}
 fail:
 	if (arg0 && lparg0) setNSRangeFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#endif
 {
 	NSRange _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSRangeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSRange *, id, SEL, jint))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, arg3);
+		((void (*)(NSRange *, jintLong, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3);
 	} else {
-		*lparg0 = (*(NSRange (*)(id, SEL, jint))objc_msgSend)((id)arg1, (SEL)arg2, arg3);
+		*lparg0 = (*(NSRange (*)(jintLong, jintLong, jintLong))objc_msgSend)(arg1, arg2, arg3);
 	}
 fail:
 	if (arg0 && lparg0) setNSRangeFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	NSRect _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSRect *, id, SEL))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2);
+		((void (*)(NSRect *, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2);
 	} else {
-		*lparg0 = (*(NSRect (*)(id, SEL))objc_msgSend)((id)arg1, (SEL)arg2);
+		*lparg0 = (*(NSRect (*)(jintLong, jintLong))objc_msgSend)(arg1, arg2);
 	}
 fail:
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#endif
 {
 	NSRect _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSRect *, id, SEL, jint))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, arg3);
+		((void (*)(NSRect *, jintLong, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3);
 	} else {
-		*lparg0 = (*(NSRect (*)(id, SEL, jint))objc_msgSend)((id)arg1, (SEL)arg2, arg3);
+		*lparg0 = (*(NSRect (*)(jintLong, jintLong, jintLong))objc_msgSend)(arg1, arg2, arg3);
 	}
 fail:
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
+#endif
 {
 	NSRect _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSRect *, id, SEL, jint, jint))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, arg3, arg4);
+		((void (*)(NSRect *, jintLong, jintLong, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3, arg4);
 	} else {
-		*lparg0 = (*(NSRect (*)(id, SEL, jint, jint))objc_msgSend)((id)arg1, (SEL)arg2, arg3, arg4);
+		*lparg0 = (*(NSRect (*)(jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg1, arg2, arg3, arg4);
 	}
 fail:
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4, jboolean arg5)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jboolean arg5)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jboolean arg5)
+#endif
 {
 	NSRect _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSRect *, id, SEL, jint, jint, jboolean))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, arg3, arg4, arg5);
+		((void (*)(NSRect *, jintLong, jintLong, jintLong, jintLong, jboolean))objc_msgSend_stret)(lparg0, arg1, arg2, arg3, arg4, arg5);
 	} else {
-		*lparg0 = (*(NSRect (*)(id, SEL, jint, jint, jboolean))objc_msgSend)((id)arg1, (SEL)arg2, arg3, arg4, arg5);
+		*lparg0 = (*(NSRect (*)(jintLong, jintLong, jintLong, jintLong, jboolean))objc_msgSend)(arg1, arg2, arg3, arg4, arg5);
 	}
 fail:
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
+#endif
 {
 	NSRect _arg0, *lparg0=NULL;
 	NSRange _arg3, *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRangeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSRect *, id, SEL, NSRange, jint))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, *lparg3, arg4);
+		((void (*)(NSRect *, jintLong, jintLong, NSRange, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
 	} else {
-		*lparg0 = (*(NSRect (*)(id, SEL, NSRange, jint))objc_msgSend)((id)arg1, (SEL)arg2, *lparg3, arg4);
+		*lparg0 = (*(NSRect (*)(jintLong, jintLong, NSRange, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
 	}
 fail:
 	if (arg3 && lparg3) setNSRangeFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	NSRect _arg0, *lparg0=NULL;
 	NSRect _arg3, *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSRect *, id, SEL, NSRect))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, *lparg3);
+		((void (*)(NSRect *, jintLong, jintLong, NSRect))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
 	} else {
-		*lparg0 = (*(NSRect (*)(id, SEL, NSRect))objc_msgSend)((id)arg1, (SEL)arg2, *lparg3);
+		*lparg0 = (*(NSRect (*)(jintLong, jintLong, NSRect))objc_msgSend)(arg1, arg2, *lparg3);
 	}
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
+#endif
 {
 	NSRect _arg0, *lparg0=NULL;
 	NSRect _arg3, *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSRect *, id, SEL, NSRect, jint))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, *lparg3, arg4);
+		((void (*)(NSRect *, jintLong, jintLong, NSRect, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
 	} else {
-		*lparg0 = (*(NSRect (*)(id, SEL, NSRect, jint))objc_msgSend)((id)arg1, (SEL)arg2, *lparg3, arg4);
+		*lparg0 = (*(NSRect (*)(jintLong, jintLong, NSRect, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
 	}
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	NSSize _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSSize *, id, SEL))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2);
+		((void (*)(NSSize *, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2);
 	} else {
-		*lparg0 = (*(NSSize (*)(id, SEL))objc_msgSend)((id)arg1, (SEL)arg2);
+		*lparg0 = (*(NSSize (*)(jintLong, jintLong))objc_msgSend)(arg1, arg2);
 	}
 fail:
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	NSSize _arg0, *lparg0=NULL;
 	NSSize _arg3, *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSSizeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSSize *, id, SEL, NSSize))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, *lparg3);
+		((void (*)(NSSize *, jintLong, jintLong, NSSize))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
 	} else {
-		*lparg0 = (*(NSSize (*)(id, SEL, NSSize))objc_msgSend)((id)arg1, (SEL)arg2, *lparg3);
+		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSSize))objc_msgSend)(arg1, arg2, *lparg3);
 	}
 fail:
 	if (arg3 && lparg3) setNSSizeFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
+#endif
 {
 	NSSize _arg0, *lparg0=NULL;
 	NSSize _arg3, *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSSizeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSSize *, id, SEL, NSSize, jint))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, *lparg3, arg4);
+		((void (*)(NSSize *, jintLong, jintLong, NSSize, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
 	} else {
-		*lparg0 = (*(NSSize (*)(id, SEL, NSSize, jint))objc_msgSend)((id)arg1, (SEL)arg2, *lparg3, arg4);
+		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSSize, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
 	}
 fail:
 	if (arg3 && lparg3) setNSSizeFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3, jboolean arg4, jboolean arg5, jint arg6)
+#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jboolean arg4, jboolean arg5, jintLong arg6)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jboolean arg4, jboolean arg5, jintLong arg6)
+#endif
 {
 	NSSize _arg0, *lparg0=NULL;
 	NSSize _arg3, *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSSizeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		((void (*)(NSSize *, id, SEL, NSSize, jboolean, jboolean, jint))objc_msgSend_stret)(lparg0, (id)arg1, (SEL)arg2, *lparg3, arg4, arg5, arg6);
+		((void (*)(NSSize *, jintLong, jintLong, NSSize, jboolean, jboolean, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4, arg5, arg6);
 	} else {
-		*lparg0 = (*(NSSize (*)(id, SEL, NSSize, jboolean, jboolean, jint))objc_msgSend)((id)arg1, (SEL)arg2, *lparg3, arg4, arg5, arg6);
+		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSSize, jboolean, jboolean, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4, arg5, arg6);
 	}
 fail:
 	if (arg3 && lparg3) setNSSizeFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO_objc_1registerClassPair
 JNIEXPORT void JNICALL OS_NATIVE(objc_1registerClassPair)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, objc_1registerClassPair_FUNC);
 	objc_registerClassPair((Class)arg0);
@@ -2957,30 +3889,30 @@ JNIEXPORT jint JNICALL OS_NATIVE(objc_1super_1sizeof)
 #endif
 
 #ifndef NO_object_1getClassName
-JNIEXPORT jint JNICALL OS_NATIVE(object_1getClassName)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(object_1getClassName)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, object_1getClassName_FUNC);
-	rc = (jint)object_getClassName((id)arg0);
+	rc = (jintLong)object_getClassName((id)arg0);
 	OS_NATIVE_EXIT(env, that, object_1getClassName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_object_1getInstanceVariable
-JNIEXPORT jint JNICALL OS_NATIVE(object_1getInstanceVariable)
-	(JNIEnv *env, jclass that, jint arg0, jstring arg1, jintArray arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(object_1getInstanceVariable)
+	(JNIEnv *env, jclass that, jintLong arg0, jstring arg1, jintLongArray arg2)
 {
 	const char *lparg1= NULL;
-	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong *lparg2=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, object_1getInstanceVariable_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetStringUTFChars(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)object_getInstanceVariable((id)arg0, (const char *)lparg1, (void **)lparg2);
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jintLong)object_getInstanceVariable((id)arg0, lparg1, (void **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseStringUTFChars(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, object_1getInstanceVariable_FUNC);
 	return rc;
@@ -2988,26 +3920,26 @@ fail:
 #endif
 
 #ifndef NO_object_1setClass
-JNIEXPORT jint JNICALL OS_NATIVE(object_1setClass)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(object_1setClass)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, object_1setClass_FUNC);
-	rc = (jint)object_setClass((id)arg0, (Class)arg1);
+	rc = (jintLong)object_setClass((id)arg0, (Class)arg1);
 	OS_NATIVE_EXIT(env, that, object_1setClass_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_object_1setInstanceVariable
-JNIEXPORT jint JNICALL OS_NATIVE(object_1setInstanceVariable)
-	(JNIEnv *env, jclass that, jint arg0, jstring arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(object_1setInstanceVariable)
+	(JNIEnv *env, jclass that, jintLong arg0, jstring arg1, jintLong arg2)
 {
 	const char *lparg1= NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, object_1setInstanceVariable_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetStringUTFChars(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)object_setInstanceVariable((id)arg0, (const char *)lparg1, (void *)arg2);
+	rc = (jintLong)object_setInstanceVariable((id)arg0, lparg1, (void *)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseStringUTFChars(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, object_1setInstanceVariable_FUNC);
@@ -3016,14 +3948,14 @@ fail:
 #endif
 
 #ifndef NO_sel_1registerName
-JNIEXPORT jint JNICALL OS_NATIVE(sel_1registerName)
+JNIEXPORT jintLong JNICALL OS_NATIVE(sel_1registerName)
 	(JNIEnv *env, jclass that, jstring arg0)
 {
 	const char *lparg0= NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, sel_1registerName_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetStringUTFChars(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)sel_registerName((const char *)lparg0);
+	rc = (jintLong)sel_registerName(lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseStringUTFChars(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, sel_1registerName_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h
index 328ff12567..61c0764d6f 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h
@@ -23,7 +23,7 @@
 
 #include "os_custom.h"
 
-extern jint CPSSetProcessName(void *, SWT_PTR);
+extern jint CPSSetProcessName(void *, jintLong);
 
 #ifndef __i386__
 #define objc_msgSend_fpret objc_msgSend
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c
index f8896141f3..5d2e745c76 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c
@@ -17,7 +17,7 @@
 
 #ifndef NO_JNIGetObject
 JNIEXPORT jobject JNICALL OS_NATIVE(JNIGetObject)
-	(JNIEnv *env, jclass that, SWT_PTR arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jobject rc = 0;
 	OS_NATIVE_ENTER(env, that, JNIGetObject_FUNC);
@@ -48,120 +48,120 @@ fail:
 #endif
 
 #ifndef NO_drawRect_1CALLBACK
-static SWT_PTR drawRect_1CALLBACK;
+static jintLong drawRect_1CALLBACK;
 static void drawRect(id obj, SEL sel, NSRect rect)
 {
 	return ((void (*)(id, SEL, NSRect*))drawRect_1CALLBACK)(obj, sel, &rect);
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(drawRect_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(drawRect_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	drawRect_1CALLBACK = func;
-	return (SWT_PTR)drawRect;
+	return (jintLong)drawRect;
 }
 #endif
 
 
 #ifndef NO_drawInteriorWithFrame_1inView_1CALLBACK
-static SWT_PTR drawInteriorWithFrame_1inView_1CALLBACK;
+static jintLong drawInteriorWithFrame_1inView_1CALLBACK;
 static void drawInteriorWithFrame_1inView(id obj, SEL sel, NSRect rect, NSView* view)
 {
 	return ((void (*)(id, SEL, NSRect*, NSView*))drawInteriorWithFrame_1inView_1CALLBACK)(obj, sel, &rect, view);
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(drawInteriorWithFrame_1inView_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(drawInteriorWithFrame_1inView_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	drawInteriorWithFrame_1inView_1CALLBACK = func;
-	return (SWT_PTR)drawInteriorWithFrame_1inView;
+	return (jintLong)drawInteriorWithFrame_1inView;
 }
 #endif
 
 #ifndef NO_setFrame_1CALLBACK
-static SWT_PTR setFrame_1CALLBACK;
+static jintLong setFrame_1CALLBACK;
 static void setFrame(id obj, SEL sel, NSRect rect)
 {
 	return ((void (*)(id, SEL, NSRect*))setFrame_1CALLBACK)(obj, sel, &rect);
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(setFrame_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(setFrame_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	setFrame_1CALLBACK = func;
-	return (SWT_PTR)setFrame;
+	return (jintLong)setFrame;
 }
 #endif
 
 #ifndef NO_setFrameOrigin_1CALLBACK
-static SWT_PTR setFrameOrigin_1CALLBACK;
+static jintLong setFrameOrigin_1CALLBACK;
 static void setFrameOrigin(id obj, SEL sel, NSPoint point)
 {
 	return ((void (*)(id, SEL, NSPoint*))setFrameOrigin_1CALLBACK)(obj, sel, &point);
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(setFrameOrigin_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(setFrameOrigin_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	setFrameOrigin_1CALLBACK = func;
-	return (SWT_PTR)setFrameOrigin;
+	return (jintLong)setFrameOrigin;
 }
 #endif
 
 #ifndef NO_setFrameSize_1CALLBACK
-static SWT_PTR setFrameSize_1CALLBACK;
+static jintLong setFrameSize_1CALLBACK;
 static void setFrameSize(id obj, SEL sel, NSSize size)
 {
 	return ((void (*)(id, SEL, NSSize*))setFrameSize_1CALLBACK)(obj, sel, &size);
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(setFrameSize_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(setFrameSize_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	setFrameSize_1CALLBACK = func;
-	return (SWT_PTR)setFrameSize;
+	return (jintLong)setFrameSize;
 }
 #endif
 
 #ifndef NO_hitTest_1CALLBACK
-static SWT_PTR hitTest_1CALLBACK;
+static jintLong hitTest_1CALLBACK;
 static void hitTest(id obj, SEL sel, NSPoint point)
 {
 	return ((void (*)(id, SEL, NSPoint*))hitTest_1CALLBACK)(obj, sel, &point);
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(hitTest_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(hitTest_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	hitTest_1CALLBACK = func;
-	return (SWT_PTR)hitTest;
+	return (jintLong)hitTest;
 }
 #endif
 
 #ifndef NO_webView_1setFrame_1CALLBACK
-static SWT_PTR webView_1setFrame_1CALLBACK;
+static jintLong webView_1setFrame_1CALLBACK;
 static void webView_1setFrame(id obj, SEL sel, WebView *sender, NSRect rect)
 {
 	return ((void (*)(id, SEL, WebView*, NSRect*))webView_1setFrame_1CALLBACK)(obj, sel, sender, &rect);
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(webView_1setFrame_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(webView_1setFrame_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	webView_1setFrame_1CALLBACK = func;
-	return (SWT_PTR)webView_1setFrame;
+	return (jintLong)webView_1setFrame;
 }
 #endif
 
 #ifndef NO_setMarkedText_1selectedRange_1CALLBACK
-static SWT_PTR setMarkedText_1selectedRange_1CALLBACK;
+static jintLong setMarkedText_1selectedRange_1CALLBACK;
 static void setMarkedText_1selectedRange(id obj, SEL sel, id *arg0, NSRange arg1)
 {
 	((void (*)(id, SEL, id*, NSRange*))setMarkedText_1selectedRange_1CALLBACK)(obj, sel, arg0, &arg1);
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(setMarkedText_1selectedRange_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(setMarkedText_1selectedRange_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	setMarkedText_1selectedRange_1CALLBACK = func;
-	return (SWT_PTR)setMarkedText_1selectedRange;
+	return (jintLong)setMarkedText_1selectedRange;
 }
 #endif
 
 #ifndef NO_selectedRange_1CALLBACK
-static SWT_PTR selectedRange_1CALLBACK;
+static jintLong selectedRange_1CALLBACK;
 static NSRange selectedRangeProc(id obj, SEL sel)
 {
 	NSRange* ptr = ((NSRange* (*)(id, SEL))selectedRange_1CALLBACK)(obj, sel);
@@ -169,16 +169,16 @@ static NSRange selectedRangeProc(id obj, SEL sel)
 	free(ptr);
 	return range;
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(selectedRange_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(selectedRange_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	selectedRange_1CALLBACK = func;
-	return (SWT_PTR)selectedRangeProc;
+	return (jintLong)selectedRangeProc;
 }
 #endif
 
 #ifndef NO_markedRange_1CALLBACK
-static SWT_PTR markedRange_1CALLBACK;
+static jintLong markedRange_1CALLBACK;
 static NSRange markedRangeProc(id obj, SEL sel)
 {
 	NSRange* ptr = ((NSRange* (*)(id, SEL))markedRange_1CALLBACK)(obj, sel);
@@ -186,30 +186,30 @@ static NSRange markedRangeProc(id obj, SEL sel)
 	free(ptr);
 	return range;
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(markedRange_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(markedRange_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	markedRange_1CALLBACK = func;
-	return (SWT_PTR)markedRangeProc;
+	return (jintLong)markedRangeProc;
 }
 #endif
 
 #ifndef NO_characterIndexForPoint_1CALLBACK
-static SWT_PTR characterIndexForPoint_1CALLBACK;
+static jintLong characterIndexForPoint_1CALLBACK;
 static int characterIndexForPoint(id obj, SEL sel, NSPoint point)
 {
 	return ((int (*)(id, SEL, NSPoint*))characterIndexForPoint_1CALLBACK)(obj, sel, &point);
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(characterIndexForPoint_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(characterIndexForPoint_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	characterIndexForPoint_1CALLBACK = func;
-	return (SWT_PTR)characterIndexForPoint;
+	return (jintLong)characterIndexForPoint;
 }
 #endif
 
 #ifndef NO_firstRectForCharacterRange_1CALLBACK
-static SWT_PTR firstRectForCharacterRange_1CALLBACK;
+static jintLong firstRectForCharacterRange_1CALLBACK;
 static NSRect firstRectForCharacterRangeProc(id obj, SEL sel, NSRange arg0)
 {
 	NSRect* ptr = ((NSRect* (*)(id, SEL, NSRange*))firstRectForCharacterRange_1CALLBACK)(obj, sel, &arg0);
@@ -217,30 +217,30 @@ static NSRect firstRectForCharacterRangeProc(id obj, SEL sel, NSRange arg0)
 	free(ptr);
 	return result;
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(firstRectForCharacterRange_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(firstRectForCharacterRange_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	firstRectForCharacterRange_1CALLBACK = func;
-	return (SWT_PTR)firstRectForCharacterRangeProc;
+	return (jintLong)firstRectForCharacterRangeProc;
 }
 #endif
 
 #ifndef NO_attributedSubstringFromRange_1CALLBACK
-static SWT_PTR attributedSubstringFromRange_1CALLBACK;
+static jintLong attributedSubstringFromRange_1CALLBACK;
 static id attributedSubstringFromRangeProc(id obj, SEL sel, NSRange arg0)
 {
 	return ((id (*)(id, SEL, NSRange*))attributedSubstringFromRange_1CALLBACK)(obj, sel, &arg0);
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(attributedSubstringFromRange_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(attributedSubstringFromRange_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	attributedSubstringFromRange_1CALLBACK = func;
-	return (SWT_PTR)attributedSubstringFromRangeProc;
+	return (jintLong)attributedSubstringFromRangeProc;
 }
 #endif
 
 #ifndef NO_textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1CALLBACK
-static SWT_PTR textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1CALLBACK;
+static jintLong textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1CALLBACK;
 static NSRange textView_1willChangeSelectionFromCharacterRange_1toCharacterRange(id obj, SEL sel, NSTextView *aTextView, NSRange oldSelectedCharRange, NSRange newSelectedCharRange)
 {
 	NSRange* ptr = ((NSRange* (*)(id, SEL, NSTextView*, NSRange*, NSRange*))textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1CALLBACK)(obj, sel, aTextView, &oldSelectedCharRange, &newSelectedCharRange);
@@ -248,11 +248,11 @@ static NSRange textView_1willChangeSelectionFromCharacterRange_1toCharacterRange
 	free(ptr);
 	return result;
 }
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL OS_NATIVE(textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1CALLBACK = func;
-	return (SWT_PTR)textView_1willChangeSelectionFromCharacterRange_1toCharacterRange;
+	return (jintLong)textView_1willChangeSelectionFromCharacterRange_1toCharacterRange;
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
index 599decb633..a350f147ac 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
@@ -102,112 +102,508 @@ char * OS_nativeFunctionNames[] = {
 	"hitTest_1CALLBACK",
 	"instrumentObjcMessageSends",
 	"markedRange_1CALLBACK",
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_cocoa_CGPoint_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_cocoa_CGRect_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_cocoa_CGSize_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ",
+#endif
 	"objc_1allocateClassPair",
 	"objc_1getClass",
 	"objc_1getProtocol",
 	"objc_1lookUpClass",
+#ifndef JNI64
 	"objc_1msgSend__II",
+#else
+	"objc_1msgSend__JJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IID",
+#else
+	"objc_1msgSend__JJD",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIDIIIZ",
+#else
+	"objc_1msgSend__JJDJJJZ",
+#endif
 	"objc_1msgSend__IIF",
+#ifndef JNI64
 	"objc_1msgSend__IIFF",
+#else
+	"objc_1msgSend__JJDD",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIFFFF",
+#else
+	"objc_1msgSend__JJDDDD",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__III",
+#else
+	"objc_1msgSend__JJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIIF",
+#else
+	"objc_1msgSend__JJJD",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIII",
+#else
+	"objc_1msgSend__JJJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIIII",
+#else
+	"objc_1msgSend__JJJJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIIIII",
+#else
+	"objc_1msgSend__JJJJJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIIIIII",
+#else
+	"objc_1msgSend__JJJJJJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIIIIIIII",
+#else
+	"objc_1msgSend__JJJJJJJJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIIIIIIZZIII",
+#else
+	"objc_1msgSend__JJJJJJJZZJJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIIIIIIZZIIII",
+#else
+	"objc_1msgSend__JJJJJJJZZJJJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIIIIZ",
+#else
+	"objc_1msgSend__JJJJJZ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2",
+#else
+	"objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIIIZ",
+#else
+	"objc_1msgSend__JJJJZ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#else
+	"objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII",
+#else
+	"objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2",
+#else
+	"objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIIZ",
+#else
+	"objc_1msgSend__JJJZ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2",
+#else
+	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIZ",
+#else
+	"objc_1msgSend__JJZ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__IIZI",
+#else
+	"objc_1msgSend__JJZJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__II_3B",
+#else
+	"objc_1msgSend__JJ_3B",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__II_3BI",
+#else
+	"objc_1msgSend__JJ_3BJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__II_3C",
+#else
+	"objc_1msgSend__JJ_3C",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__II_3CI",
+#else
+	"objc_1msgSend__JJ_3CJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2",
+#else
+	"objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__II_3F",
+#else
+	"objc_1msgSend__JJ_3D",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__II_3FIF",
+#else
+	"objc_1msgSend__JJ_3DJD",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__II_3I",
+#else
+	"objc_1msgSend__JJ_3I",
+#endif
+#ifndef JNI64
 	"objc_1msgSend__II_3III",
+#else
+	"objc_1msgSend__JJ_3JJJ",
+#endif
 	"objc_1msgSend__JJFD",
 	"objc_1msgSend__JJI",
+#ifndef JNI64
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I",
+#else
+	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J",
+#endif
+#ifndef JNI64
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II",
+#else
+	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ",
+#else
+	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ",
+#endif
+#ifndef JNI64
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#else
+	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2",
+#else
+	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2",
+#else
+	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1fpret__II",
+#else
+	"objc_1msgSend_1fpret__JJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1fpret__III",
+#else
+	"objc_1msgSend_1fpret__JJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1fpret__IIII",
+#else
+	"objc_1msgSend_1fpret__JJJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J",
+#endif
+#ifndef JNI64
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI",
+#else
+	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ",
+#endif
 	"objc_1registerClassPair",
 	"objc_1super_1sizeof",
 	"object_1getClassName",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
index de7f94cafa..9dc732a9b6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
@@ -110,112 +110,508 @@ typedef enum {
 	hitTest_1CALLBACK_FUNC,
 	instrumentObjcMessageSends_FUNC,
 	markedRange_1CALLBACK_FUNC,
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_cocoa_CGPoint_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_cocoa_CGPoint_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_cocoa_CGRect_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_cocoa_CGRect_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_cocoa_CGSize_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_cocoa_CGSize_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_cocoa_CGPoint_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_cocoa_CGRect_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_cocoa_CGSize_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC,
+#endif
 	objc_1allocateClassPair_FUNC,
 	objc_1getClass_FUNC,
 	objc_1getProtocol_FUNC,
 	objc_1lookUpClass_FUNC,
+#ifndef JNI64
 	objc_1msgSend__II_FUNC,
+#else
+	objc_1msgSend__JJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IID_FUNC,
+#else
+	objc_1msgSend__JJD_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIDIIIZ_FUNC,
+#else
+	objc_1msgSend__JJDJJJZ_FUNC,
+#endif
 	objc_1msgSend__IIF_FUNC,
+#ifndef JNI64
 	objc_1msgSend__IIFF_FUNC,
+#else
+	objc_1msgSend__JJDD_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIFFFF_FUNC,
+#else
+	objc_1msgSend__JJDDDD_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__III_FUNC,
+#else
+	objc_1msgSend__JJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIIF_FUNC,
+#else
+	objc_1msgSend__JJJD_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIII_FUNC,
+#else
+	objc_1msgSend__JJJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIIII_FUNC,
+#else
+	objc_1msgSend__JJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIIIII_FUNC,
+#else
+	objc_1msgSend__JJJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIIIIII_FUNC,
+#else
+	objc_1msgSend__JJJJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIIIIIIII_FUNC,
+#else
+	objc_1msgSend__JJJJJJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIIIIIIZZIII_FUNC,
+#else
+	objc_1msgSend__JJJJJJJZZJJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIIIIIIZZIIII_FUNC,
+#else
+	objc_1msgSend__JJJJJJJZZJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIIIIZ_FUNC,
+#else
+	objc_1msgSend__JJJJJZ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
+#else
+	objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIIIZ_FUNC,
+#else
+	objc_1msgSend__JJJJZ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#else
+	objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_FUNC,
+#else
+	objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
+#else
+	objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIIZ_FUNC,
+#else
+	objc_1msgSend__JJJZ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
+#else
+	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIZ_FUNC,
+#else
+	objc_1msgSend__JJZ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__IIZI_FUNC,
+#else
+	objc_1msgSend__JJZJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__II_3B_FUNC,
+#else
+	objc_1msgSend__JJ_3B_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__II_3BI_FUNC,
+#else
+	objc_1msgSend__JJ_3BJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__II_3C_FUNC,
+#else
+	objc_1msgSend__JJ_3C_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__II_3CI_FUNC,
+#else
+	objc_1msgSend__JJ_3CJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
+#else
+	objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__II_3F_FUNC,
+#else
+	objc_1msgSend__JJ_3D_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__II_3FIF_FUNC,
+#else
+	objc_1msgSend__JJ_3DJD_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__II_3I_FUNC,
+#else
+	objc_1msgSend__JJ_3I_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend__II_3III_FUNC,
+#else
+	objc_1msgSend__JJ_3JJJ_FUNC,
+#endif
 	objc_1msgSend__JJFD_FUNC,
 	objc_1msgSend__JJI_FUNC,
+#ifndef JNI64
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I_FUNC,
+#else
+	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II_FUNC,
+#else
+	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ_FUNC,
+#else
+	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#else
+	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
+#else
+	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
+#else
+	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1fpret__II_FUNC,
+#else
+	objc_1msgSend_1fpret__JJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1fpret__III_FUNC,
+#else
+	objc_1msgSend_1fpret__JJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1fpret__IIII_FUNC,
+#else
+	objc_1msgSend_1fpret__JJJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC,
+#endif
+#ifndef JNI64
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_FUNC,
+#else
+	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ_FUNC,
+#endif
 	objc_1registerClassPair_FUNC,
 	objc_1super_1sizeof_FUNC,
 	object_1getClassName_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.c
index 2c7eac7ee6..efc1f17dcc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.c
@@ -25,24 +25,24 @@ void cacheCGPointFields(JNIEnv *env, jobject lpObject)
 {
 	if (CGPointFc.cached) return;
 	CGPointFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CGPointFc.x = (*env)->GetFieldID(env, CGPointFc.clazz, "x", "F");
-	CGPointFc.y = (*env)->GetFieldID(env, CGPointFc.clazz, "y", "F");
+	CGPointFc.x = (*env)->GetFieldID(env, CGPointFc.clazz, "x", F_D);
+	CGPointFc.y = (*env)->GetFieldID(env, CGPointFc.clazz, "y", F_D);
 	CGPointFc.cached = 1;
 }
 
 CGPoint *getCGPointFields(JNIEnv *env, jobject lpObject, CGPoint *lpStruct)
 {
 	if (!CGPointFc.cached) cacheCGPointFields(env, lpObject);
-	lpStruct->x = (*env)->GetFloatField(env, lpObject, CGPointFc.x);
-	lpStruct->y = (*env)->GetFloatField(env, lpObject, CGPointFc.y);
+	lpStruct->x = (*env)->GetFloatDoubleField(env, lpObject, CGPointFc.x);
+	lpStruct->y = (*env)->GetFloatDoubleField(env, lpObject, CGPointFc.y);
 	return lpStruct;
 }
 
 void setCGPointFields(JNIEnv *env, jobject lpObject, CGPoint *lpStruct)
 {
 	if (!CGPointFc.cached) cacheCGPointFields(env, lpObject);
-	(*env)->SetFloatField(env, lpObject, CGPointFc.x, (jfloat)lpStruct->x);
-	(*env)->SetFloatField(env, lpObject, CGPointFc.y, (jfloat)lpStruct->y);
+	(*env)->SetFloatDoubleField(env, lpObject, CGPointFc.x, (jfloatDouble)lpStruct->x);
+	(*env)->SetFloatDoubleField(env, lpObject, CGPointFc.y, (jfloatDouble)lpStruct->y);
 }
 #endif
 
@@ -105,24 +105,24 @@ void cacheCGSizeFields(JNIEnv *env, jobject lpObject)
 {
 	if (CGSizeFc.cached) return;
 	CGSizeFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CGSizeFc.width = (*env)->GetFieldID(env, CGSizeFc.clazz, "width", "F");
-	CGSizeFc.height = (*env)->GetFieldID(env, CGSizeFc.clazz, "height", "F");
+	CGSizeFc.width = (*env)->GetFieldID(env, CGSizeFc.clazz, "width", F_D);
+	CGSizeFc.height = (*env)->GetFieldID(env, CGSizeFc.clazz, "height", F_D);
 	CGSizeFc.cached = 1;
 }
 
 CGSize *getCGSizeFields(JNIEnv *env, jobject lpObject, CGSize *lpStruct)
 {
 	if (!CGSizeFc.cached) cacheCGSizeFields(env, lpObject);
-	lpStruct->width = (*env)->GetFloatField(env, lpObject, CGSizeFc.width);
-	lpStruct->height = (*env)->GetFloatField(env, lpObject, CGSizeFc.height);
+	lpStruct->width = (*env)->GetFloatDoubleField(env, lpObject, CGSizeFc.width);
+	lpStruct->height = (*env)->GetFloatDoubleField(env, lpObject, CGSizeFc.height);
 	return lpStruct;
 }
 
 void setCGSizeFields(JNIEnv *env, jobject lpObject, CGSize *lpStruct)
 {
 	if (!CGSizeFc.cached) cacheCGSizeFields(env, lpObject);
-	(*env)->SetFloatField(env, lpObject, CGSizeFc.width, (jfloat)lpStruct->width);
-	(*env)->SetFloatField(env, lpObject, CGSizeFc.height, (jfloat)lpStruct->height);
+	(*env)->SetFloatDoubleField(env, lpObject, CGSizeFc.width, (jfloatDouble)lpStruct->width);
+	(*env)->SetFloatDoubleField(env, lpObject, CGSizeFc.height, (jfloatDouble)lpStruct->height);
 }
 #endif
 
@@ -139,36 +139,36 @@ void cacheNSAffineTransformStructFields(JNIEnv *env, jobject lpObject)
 {
 	if (NSAffineTransformStructFc.cached) return;
 	NSAffineTransformStructFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NSAffineTransformStructFc.m11 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m11", "F");
-	NSAffineTransformStructFc.m12 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m12", "F");
-	NSAffineTransformStructFc.m21 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m21", "F");
-	NSAffineTransformStructFc.m22 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m22", "F");
-	NSAffineTransformStructFc.tX = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "tX", "F");
-	NSAffineTransformStructFc.tY = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "tY", "F");
+	NSAffineTransformStructFc.m11 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m11", F_D);
+	NSAffineTransformStructFc.m12 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m12", F_D);
+	NSAffineTransformStructFc.m21 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m21", F_D);
+	NSAffineTransformStructFc.m22 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m22", F_D);
+	NSAffineTransformStructFc.tX = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "tX", F_D);
+	NSAffineTransformStructFc.tY = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "tY", F_D);
 	NSAffineTransformStructFc.cached = 1;
 }
 
 NSAffineTransformStruct *getNSAffineTransformStructFields(JNIEnv *env, jobject lpObject, NSAffineTransformStruct *lpStruct)
 {
 	if (!NSAffineTransformStructFc.cached) cacheNSAffineTransformStructFields(env, lpObject);
-	lpStruct->m11 = (*env)->GetFloatField(env, lpObject, NSAffineTransformStructFc.m11);
-	lpStruct->m12 = (*env)->GetFloatField(env, lpObject, NSAffineTransformStructFc.m12);
-	lpStruct->m21 = (*env)->GetFloatField(env, lpObject, NSAffineTransformStructFc.m21);
-	lpStruct->m22 = (*env)->GetFloatField(env, lpObject, NSAffineTransformStructFc.m22);
-	lpStruct->tX = (*env)->GetFloatField(env, lpObject, NSAffineTransformStructFc.tX);
-	lpStruct->tY = (*env)->GetFloatField(env, lpObject, NSAffineTransformStructFc.tY);
+	lpStruct->m11 = (*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m11);
+	lpStruct->m12 = (*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m12);
+	lpStruct->m21 = (*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m21);
+	lpStruct->m22 = (*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m22);
+	lpStruct->tX = (*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.tX);
+	lpStruct->tY = (*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.tY);
 	return lpStruct;
 }
 
 void setNSAffineTransformStructFields(JNIEnv *env, jobject lpObject, NSAffineTransformStruct *lpStruct)
 {
 	if (!NSAffineTransformStructFc.cached) cacheNSAffineTransformStructFields(env, lpObject);
-	(*env)->SetFloatField(env, lpObject, NSAffineTransformStructFc.m11, (jfloat)lpStruct->m11);
-	(*env)->SetFloatField(env, lpObject, NSAffineTransformStructFc.m12, (jfloat)lpStruct->m12);
-	(*env)->SetFloatField(env, lpObject, NSAffineTransformStructFc.m21, (jfloat)lpStruct->m21);
-	(*env)->SetFloatField(env, lpObject, NSAffineTransformStructFc.m22, (jfloat)lpStruct->m22);
-	(*env)->SetFloatField(env, lpObject, NSAffineTransformStructFc.tX, (jfloat)lpStruct->tX);
-	(*env)->SetFloatField(env, lpObject, NSAffineTransformStructFc.tY, (jfloat)lpStruct->tY);
+	(*env)->SetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m11, (jfloatDouble)lpStruct->m11);
+	(*env)->SetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m12, (jfloatDouble)lpStruct->m12);
+	(*env)->SetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m21, (jfloatDouble)lpStruct->m21);
+	(*env)->SetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m22, (jfloatDouble)lpStruct->m22);
+	(*env)->SetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.tX, (jfloatDouble)lpStruct->tX);
+	(*env)->SetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.tY, (jfloatDouble)lpStruct->tY);
 }
 #endif
 
@@ -185,24 +185,24 @@ void cacheNSPointFields(JNIEnv *env, jobject lpObject)
 {
 	if (NSPointFc.cached) return;
 	NSPointFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NSPointFc.x = (*env)->GetFieldID(env, NSPointFc.clazz, "x", "F");
-	NSPointFc.y = (*env)->GetFieldID(env, NSPointFc.clazz, "y", "F");
+	NSPointFc.x = (*env)->GetFieldID(env, NSPointFc.clazz, "x", F_D);
+	NSPointFc.y = (*env)->GetFieldID(env, NSPointFc.clazz, "y", F_D);
 	NSPointFc.cached = 1;
 }
 
 NSPoint *getNSPointFields(JNIEnv *env, jobject lpObject, NSPoint *lpStruct)
 {
 	if (!NSPointFc.cached) cacheNSPointFields(env, lpObject);
-	lpStruct->x = (*env)->GetFloatField(env, lpObject, NSPointFc.x);
-	lpStruct->y = (*env)->GetFloatField(env, lpObject, NSPointFc.y);
+	lpStruct->x = (*env)->GetFloatDoubleField(env, lpObject, NSPointFc.x);
+	lpStruct->y = (*env)->GetFloatDoubleField(env, lpObject, NSPointFc.y);
 	return lpStruct;
 }
 
 void setNSPointFields(JNIEnv *env, jobject lpObject, NSPoint *lpStruct)
 {
 	if (!NSPointFc.cached) cacheNSPointFields(env, lpObject);
-	(*env)->SetFloatField(env, lpObject, NSPointFc.x, (jfloat)lpStruct->x);
-	(*env)->SetFloatField(env, lpObject, NSPointFc.y, (jfloat)lpStruct->y);
+	(*env)->SetFloatDoubleField(env, lpObject, NSPointFc.x, (jfloatDouble)lpStruct->x);
+	(*env)->SetFloatDoubleField(env, lpObject, NSPointFc.y, (jfloatDouble)lpStruct->y);
 }
 #endif
 
@@ -219,24 +219,24 @@ void cacheNSRangeFields(JNIEnv *env, jobject lpObject)
 {
 	if (NSRangeFc.cached) return;
 	NSRangeFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NSRangeFc.location = (*env)->GetFieldID(env, NSRangeFc.clazz, "location", "I");
-	NSRangeFc.length = (*env)->GetFieldID(env, NSRangeFc.clazz, "length", "I");
+	NSRangeFc.location = (*env)->GetFieldID(env, NSRangeFc.clazz, "location", I_J);
+	NSRangeFc.length = (*env)->GetFieldID(env, NSRangeFc.clazz, "length", I_J);
 	NSRangeFc.cached = 1;
 }
 
 NSRange *getNSRangeFields(JNIEnv *env, jobject lpObject, NSRange *lpStruct)
 {
 	if (!NSRangeFc.cached) cacheNSRangeFields(env, lpObject);
-	lpStruct->location = (*env)->GetIntField(env, lpObject, NSRangeFc.location);
-	lpStruct->length = (*env)->GetIntField(env, lpObject, NSRangeFc.length);
+	lpStruct->location = (*env)->GetIntLongField(env, lpObject, NSRangeFc.location);
+	lpStruct->length = (*env)->GetIntLongField(env, lpObject, NSRangeFc.length);
 	return lpStruct;
 }
 
 void setNSRangeFields(JNIEnv *env, jobject lpObject, NSRange *lpStruct)
 {
 	if (!NSRangeFc.cached) cacheNSRangeFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, NSRangeFc.location, (jint)lpStruct->location);
-	(*env)->SetIntField(env, lpObject, NSRangeFc.length, (jint)lpStruct->length);
+	(*env)->SetIntLongField(env, lpObject, NSRangeFc.location, (jintLong)lpStruct->location);
+	(*env)->SetIntLongField(env, lpObject, NSRangeFc.length, (jintLong)lpStruct->length);
 }
 #endif
 
@@ -253,30 +253,30 @@ void cacheNSRectFields(JNIEnv *env, jobject lpObject)
 {
 	if (NSRectFc.cached) return;
 	NSRectFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NSRectFc.x = (*env)->GetFieldID(env, NSRectFc.clazz, "x", "F");
-	NSRectFc.y = (*env)->GetFieldID(env, NSRectFc.clazz, "y", "F");
-	NSRectFc.width = (*env)->GetFieldID(env, NSRectFc.clazz, "width", "F");
-	NSRectFc.height = (*env)->GetFieldID(env, NSRectFc.clazz, "height", "F");
+	NSRectFc.x = (*env)->GetFieldID(env, NSRectFc.clazz, "x", F_D);
+	NSRectFc.y = (*env)->GetFieldID(env, NSRectFc.clazz, "y", F_D);
+	NSRectFc.width = (*env)->GetFieldID(env, NSRectFc.clazz, "width", F_D);
+	NSRectFc.height = (*env)->GetFieldID(env, NSRectFc.clazz, "height", F_D);
 	NSRectFc.cached = 1;
 }
 
 NSRect *getNSRectFields(JNIEnv *env, jobject lpObject, NSRect *lpStruct)
 {
 	if (!NSRectFc.cached) cacheNSRectFields(env, lpObject);
-	lpStruct->origin.x = (*env)->GetFloatField(env, lpObject, NSRectFc.x);
-	lpStruct->origin.y = (*env)->GetFloatField(env, lpObject, NSRectFc.y);
-	lpStruct->size.width = (*env)->GetFloatField(env, lpObject, NSRectFc.width);
-	lpStruct->size.height = (*env)->GetFloatField(env, lpObject, NSRectFc.height);
+	lpStruct->origin.x = (*env)->GetFloatDoubleField(env, lpObject, NSRectFc.x);
+	lpStruct->origin.y = (*env)->GetFloatDoubleField(env, lpObject, NSRectFc.y);
+	lpStruct->size.width = (*env)->GetFloatDoubleField(env, lpObject, NSRectFc.width);
+	lpStruct->size.height = (*env)->GetFloatDoubleField(env, lpObject, NSRectFc.height);
 	return lpStruct;
 }
 
 void setNSRectFields(JNIEnv *env, jobject lpObject, NSRect *lpStruct)
 {
 	if (!NSRectFc.cached) cacheNSRectFields(env, lpObject);
-	(*env)->SetFloatField(env, lpObject, NSRectFc.x, (jfloat)lpStruct->origin.x);
-	(*env)->SetFloatField(env, lpObject, NSRectFc.y, (jfloat)lpStruct->origin.y);
-	(*env)->SetFloatField(env, lpObject, NSRectFc.width, (jfloat)lpStruct->size.width);
-	(*env)->SetFloatField(env, lpObject, NSRectFc.height, (jfloat)lpStruct->size.height);
+	(*env)->SetFloatDoubleField(env, lpObject, NSRectFc.x, (jfloatDouble)lpStruct->origin.x);
+	(*env)->SetFloatDoubleField(env, lpObject, NSRectFc.y, (jfloatDouble)lpStruct->origin.y);
+	(*env)->SetFloatDoubleField(env, lpObject, NSRectFc.width, (jfloatDouble)lpStruct->size.width);
+	(*env)->SetFloatDoubleField(env, lpObject, NSRectFc.height, (jfloatDouble)lpStruct->size.height);
 }
 #endif
 
@@ -293,24 +293,24 @@ void cacheNSSizeFields(JNIEnv *env, jobject lpObject)
 {
 	if (NSSizeFc.cached) return;
 	NSSizeFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NSSizeFc.width = (*env)->GetFieldID(env, NSSizeFc.clazz, "width", "F");
-	NSSizeFc.height = (*env)->GetFieldID(env, NSSizeFc.clazz, "height", "F");
+	NSSizeFc.width = (*env)->GetFieldID(env, NSSizeFc.clazz, "width", F_D);
+	NSSizeFc.height = (*env)->GetFieldID(env, NSSizeFc.clazz, "height", F_D);
 	NSSizeFc.cached = 1;
 }
 
 NSSize *getNSSizeFields(JNIEnv *env, jobject lpObject, NSSize *lpStruct)
 {
 	if (!NSSizeFc.cached) cacheNSSizeFields(env, lpObject);
-	lpStruct->width = (*env)->GetFloatField(env, lpObject, NSSizeFc.width);
-	lpStruct->height = (*env)->GetFloatField(env, lpObject, NSSizeFc.height);
+	lpStruct->width = (*env)->GetFloatDoubleField(env, lpObject, NSSizeFc.width);
+	lpStruct->height = (*env)->GetFloatDoubleField(env, lpObject, NSSizeFc.height);
 	return lpStruct;
 }
 
 void setNSSizeFields(JNIEnv *env, jobject lpObject, NSSize *lpStruct)
 {
 	if (!NSSizeFc.cached) cacheNSSizeFields(env, lpObject);
-	(*env)->SetFloatField(env, lpObject, NSSizeFc.width, (jfloat)lpStruct->width);
-	(*env)->SetFloatField(env, lpObject, NSSizeFc.height, (jfloat)lpStruct->height);
+	(*env)->SetFloatDoubleField(env, lpObject, NSSizeFc.width, (jfloatDouble)lpStruct->width);
+	(*env)->SetFloatDoubleField(env, lpObject, NSSizeFc.height, (jfloatDouble)lpStruct->height);
 }
 #endif
 
@@ -327,24 +327,24 @@ void cacheobjc_superFields(JNIEnv *env, jobject lpObject)
 {
 	if (objc_superFc.cached) return;
 	objc_superFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	objc_superFc.receiver = (*env)->GetFieldID(env, objc_superFc.clazz, "receiver", "I");
-	objc_superFc.super_class = (*env)->GetFieldID(env, objc_superFc.clazz, "super_class", "I");
+	objc_superFc.receiver = (*env)->GetFieldID(env, objc_superFc.clazz, "receiver", I_J);
+	objc_superFc.super_class = (*env)->GetFieldID(env, objc_superFc.clazz, "super_class", I_J);
 	objc_superFc.cached = 1;
 }
 
 struct objc_super *getobjc_superFields(JNIEnv *env, jobject lpObject, struct objc_super *lpStruct)
 {
 	if (!objc_superFc.cached) cacheobjc_superFields(env, lpObject);
-	lpStruct->receiver = (id)(*env)->GetIntField(env, lpObject, objc_superFc.receiver);
-	lpStruct->super_class = (Class)(*env)->GetIntField(env, lpObject, objc_superFc.super_class);
+	lpStruct->receiver = (id)(*env)->GetIntLongField(env, lpObject, objc_superFc.receiver);
+	lpStruct->super_class = (Class)(*env)->GetIntLongField(env, lpObject, objc_superFc.super_class);
 	return lpStruct;
 }
 
 void setobjc_superFields(JNIEnv *env, jobject lpObject, struct objc_super *lpStruct)
 {
 	if (!objc_superFc.cached) cacheobjc_superFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, objc_superFc.receiver, (jint)lpStruct->receiver);
-	(*env)->SetIntField(env, lpObject, objc_superFc.super_class, (jint)lpStruct->super_class);
+	(*env)->SetIntLongField(env, lpObject, objc_superFc.receiver, (jintLong)lpStruct->receiver);
+	(*env)->SetIntLongField(env, lpObject, objc_superFc.super_class, (jintLong)lpStruct->super_class);
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
index fe7833705f..5d6908a02c 100644
--- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/AppKitFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
@@ -2780,8 +2780,8 @@
     <method selector="isHidden">
       <retval></retval>
     </method>
-    <method selector="isRunning">
-      <retval></retval>
+    <method selector="isRunning" swt_gen="true">
+      <retval swt_gen="true"></retval>
     </method>
     <method selector="keyWindow" swt_gen="true">
       <retval swt_gen="true"></retval>
diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/CoreGraphicsFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras
index 90364a782d..90364a782d 100644
--- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/CoreGraphicsFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras
diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/FoundationFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
index 2f13df2f3a..2f13df2f3a 100644
--- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/FoundationFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
index 2eefab5cae..05fb094285 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
@@ -23,9 +23,13 @@ package org.eclipse.swt.internal.cocoa;
 
 
 public class NSRect {
+	/** @field accessor=origin.x */
 	public float /*double*/ x;
+	/** @field accessor=origin.y */
 	public float /*double*/ y;
+	/** @field accessor=size.width */
 	public float /*double*/ width;
+	/** @field accessor=size.height */
 	public float /*double*/ height;
 	public static final int sizeof = OS.NSRect_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
index 0158775c80..f181d07b61 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
@@ -40,38 +40,69 @@ public class OS extends C {
 	public static final int /*long*/ sel_handleNotification_ = sel_registerName("handleNotification:");
 
 /** JNI natives */
+
+/** @method flags=jni */
 public static final native int /*long*/ NewGlobalRef(Object object);
+/**
+ * @method flags=jni
+ * @param globalRef cast=(jobject)
+ */
 public static final native void DeleteGlobalRef(int /*long*/ globalRef);
+/** @method flags=no_gen */ 
 public static final native Object JNIGetObject(int /*long*/ globalRef);
 
 /** Carbon calls */
+
 public static final native int Gestalt(int selector, int[] response);
+/** @param psn cast=(ProcessSerialNumber *) */
 public static final native int GetCurrentProcess(int[] psn);
+/** @param psn cast=(ProcessSerialNumber *) */
 public static final native int SetFrontProcess(int[] psn);
+/** @param psn cast=(ProcessSerialNumber *) */
 public static final native int TransformProcessType(int[] psn, int transformState);
 public static final native int CPSSetProcessName(int[] psn, int /*long*/ name);
 
 /** C calls */
+
 public static final native int getpid();
 
 /** QuickDraw calls */
+
+/** @method flags=dynamic */
 public static final native int /*long*/ NewRgn();
+/** @method flags=dynamic */
 public static final native void RectRgn(int /*long*/ rgnHandle, short[] rect);
+/** @method flags=dynamic */
 public static final native void OpenRgn();
+/** @method flags=dynamic */
 public static final native void OffsetRgn(int /*long*/ rgnHandle, short dh, short dv);
+/** @method flags=dynamic */
 public static final native void MoveTo(short h, short v);
+/** @method flags=dynamic */
 public static final native void LineTo(short h, short v);
+/** @method flags=dynamic */
 public static final native void UnionRgn(int /*long*/ srcRgnA, int /*long*/ srcRgnB, int /*long*/ dstRgn);
+/** @method flags=dynamic */
 public static final native void CloseRgn(int /*long*/ dstRgn);
+/** @method flags=dynamic */
 public static final native void DisposeRgn(int /*long*/ rgnHandle);
+/** @method flags=dynamic */
 public static final native boolean PtInRgn(short[] pt, int /*long*/ rgnHandle);
+/** @method flags=dynamic */
 public static final native void GetRegionBounds(int /*long*/ rgnHandle, short[] bounds);
+/** @method flags=dynamic */
 public static final native void SectRgn(int /*long*/ srcRgnA, int /*long*/ srcRgnB, int /*long*/ dstRgn);
+/** @method flags=dynamic */
 public static final native boolean EmptyRgn(int /*long*/ rgnHandle);
+/** @method flags=dynamic */
 public static final native void DiffRgn(int /*long*/ srcRgnA, int /*long*/ srcRgnB, int /*long*/ dstRgn);
+/** @method flags=dynamic */
 public static final native boolean RectInRgn(short[] rect, int /*long*/ rgnHandle);
+/** @method flags=dynamic */
 public static final native int QDRegionToRects(int /*long*/ rgn, int dir, int /*long*/ proc, int /*long*/ userData);
+/** @method flags=dynamic */
 public static final native void CopyRgn(int /*long*/ srcRgnHandle, int /*long*/ dstRgnHandle);
+/** @method flags=dynamic */
 public static final native void SetRect(short[] r, short left, short top, short right, short bottom);
 public static final int kQDParseRegionFromTop = (1 << 0);
 public static final int kQDParseRegionFromBottom = (1 << 1);
@@ -81,47 +112,107 @@ public static final int kQDParseRegionFromTopLeft = kQDParseRegionFromTop | kQDP
 public static final int kQDRegionToRectsMsgParse = 2;
 
 /** Custom callbacks */
+
+/** @method flags=no_gen */
 public static final native int /*long*/ drawRect_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ drawInteriorWithFrame_inView_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ setFrame_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ setFrameOrigin_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ setFrameSize_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ hitTest_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ webView_setFrame_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ markedRange_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ selectedRange_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ attributedSubstringFromRange_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ setMarkedText_selectedRange_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ characterIndexForPoint_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ firstRectForCharacterRange_CALLBACK(int /*long*/ func);
+/** @method flags=no_gen */
 public static final native int /*long*/ textView_willChangeSelectionFromCharacterRange_toCharacterRange_CALLBACK(int /*long*/ func);
 
 /** Custom structure return */
+
+/** @method flags=no_gen */
 public static final native void NSIntersectionRect (NSRect result, NSRect aRect, NSRect bRect);
 
 /** Objective-C runtime */
+
+/** @param cls cast=(Class) */
 public static final native boolean class_addIvar(int /*long*/ cls, String name, int /*long*/ size, byte alignment, String types);
+/**
+ * @param cls cast=(Class)
+ * @param name cast=(SEL)
+ * @param imp cast=(IMP)
+ */
 public static final native boolean class_addMethod(int /*long*/ cls, int /*long*/ name, int /*long*/ imp, String types);
+/**
+ * @param cls cast=(Class)
+ * @param protocol cast=(Protocol *)
+ */
 public static final native boolean class_addProtocol(int /*long*/ cls, int /*long*/ protocol);
+/** @method flags=dynamic */
 public static final native void instrumentObjcMessageSends(boolean val);
+/** @param superclass cast=(Class) */
 public static final native int /*long*/ objc_allocateClassPair(int /*long*/ superclass, String name, int /*long*/ extraBytes);
 public static final native int /*long*/ objc_getClass(String className);
 public static final native int /*long*/ objc_getProtocol(String name);
 public static final native int /*long*/ objc_lookUpClass(String className);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, NSRect arg0);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, NSPoint arg0);
+ /**
+  * @method flags=cast
+  * @param arg0 flags=struct
+  */
 public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, NSSize arg0);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, int /*long*/ arg0);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3);
+/** @param cls cast=(Class) */
 public static final native void objc_registerClassPair(int /*long*/ cls);
+/** @param obj cast=(id) */
 public static final native int /*long*/ object_getClassName(int /*long*/ obj);
+/**
+ * @param obj cast=(id)
+ * @param outValue cast=(void **)
+ */
 public static final native int /*long*/ object_getInstanceVariable(int /*long*/ obj, String name, int /*long*/ [] outValue);
-public static final native int /*long*/ object_setInstanceVariable(int /*long*/ obj, String name, int /*long*/ value);//TODO should value be a int[]
+/**
+ * @param obj cast=(id)
+ * @param value cast=(void *)
+ */
+public static final native int /*long*/ object_setInstanceVariable(int /*long*/ obj, String name, int /*long*/ value);
+/**
+ * @param obj cast=(id)
+ * @param clazz cast=(Class) 
+ */
 public static final native int /*long*/ object_setClass(int /*long*/ obj, int /*long*/ clazz);
 public static final native int /*long*/ sel_registerName(String selectorName);
 public static final native int objc_super_sizeof();
 
+
 /** This section is auto generated */
 
 /** Classes */
@@ -2851,160 +2942,411 @@ public static final int WebViewInsertActionPasted = 1;
 public static final int WebViewInsertActionTyped = 0;
 
 /** Globals */
+/** @method flags=const */
 public static final native int /*long*/ NSAccessibilityPositionAttribute();
 public static final NSString NSAccessibilityPositionAttribute = new NSString(NSAccessibilityPositionAttribute());
+/** @method flags=const */
 public static final native int /*long*/ NSAccessibilitySizeAttribute();
 public static final NSString NSAccessibilitySizeAttribute = new NSString(NSAccessibilitySizeAttribute());
+/** @method flags=const */
 public static final native int /*long*/ NSBackgroundColorAttributeName();
 public static final NSString NSBackgroundColorAttributeName = new NSString(NSBackgroundColorAttributeName());
+/** @method flags=const */
 public static final native int /*long*/ NSBaselineOffsetAttributeName();
 public static final NSString NSBaselineOffsetAttributeName = new NSString(NSBaselineOffsetAttributeName());
+/** @method flags=const */
 public static final native int /*long*/ NSCalibratedRGBColorSpace();
 public static final NSString NSCalibratedRGBColorSpace = new NSString(NSCalibratedRGBColorSpace());
+/** @method flags=const */
 public static final native int /*long*/ NSDeviceRGBColorSpace();
 public static final NSString NSDeviceRGBColorSpace = new NSString(NSDeviceRGBColorSpace());
+/** @method flags=const */
 public static final native int /*long*/ NSDeviceResolution();
 public static final NSString NSDeviceResolution = new NSString(NSDeviceResolution());
+/** @method flags=const */
 public static final native int /*long*/ NSFilenamesPboardType();
 public static final NSString NSFilenamesPboardType = new NSString(NSFilenamesPboardType());
+/** @method flags=const */
 public static final native int /*long*/ NSFontAttributeName();
 public static final NSString NSFontAttributeName = new NSString(NSFontAttributeName());
+/** @method flags=const */
 public static final native int /*long*/ NSForegroundColorAttributeName();
 public static final NSString NSForegroundColorAttributeName = new NSString(NSForegroundColorAttributeName());
+/** @method flags=const */
 public static final native int /*long*/ NSLinkAttributeName();
 public static final NSString NSLinkAttributeName = new NSString(NSLinkAttributeName());
+/** @method flags=const */
 public static final native int /*long*/ NSParagraphStyleAttributeName();
 public static final NSString NSParagraphStyleAttributeName = new NSString(NSParagraphStyleAttributeName());
+/** @method flags=const */
 public static final native int /*long*/ NSPrintAllPages();
 public static final NSString NSPrintAllPages = new NSString(NSPrintAllPages());
+/** @method flags=const */
 public static final native int /*long*/ NSPrintCopies();
 public static final NSString NSPrintCopies = new NSString(NSPrintCopies());
+/** @method flags=const */
 public static final native int /*long*/ NSPrintFirstPage();
 public static final NSString NSPrintFirstPage = new NSString(NSPrintFirstPage());
+/** @method flags=const */
 public static final native int /*long*/ NSPrintJobDisposition();
 public static final NSString NSPrintJobDisposition = new NSString(NSPrintJobDisposition());
+/** @method flags=const */
 public static final native int /*long*/ NSPrintLastPage();
 public static final NSString NSPrintLastPage = new NSString(NSPrintLastPage());
+/** @method flags=const */
 public static final native int /*long*/ NSPrintMustCollate();
 public static final NSString NSPrintMustCollate = new NSString(NSPrintMustCollate());
+/** @method flags=const */
 public static final native int /*long*/ NSPrintPreviewJob();
 public static final NSString NSPrintPreviewJob = new NSString(NSPrintPreviewJob());
+/** @method flags=const */
 public static final native int /*long*/ NSPrintSaveJob();
 public static final NSString NSPrintSaveJob = new NSString(NSPrintSaveJob());
+/** @method flags=const */
 public static final native int /*long*/ NSPrintSavePath();
 public static final NSString NSPrintSavePath = new NSString(NSPrintSavePath());
+/** @method flags=const */
 public static final native int /*long*/ NSPrintSpoolJob();
 public static final NSString NSPrintSpoolJob = new NSString(NSPrintSpoolJob());
+/** @method flags=const */
 public static final native int /*long*/ NSRTFPboardType();
 public static final NSString NSRTFPboardType = new NSString(NSRTFPboardType());
+/** @method flags=const */
 public static final native int /*long*/ NSStrikethroughColorAttributeName();
 public static final NSString NSStrikethroughColorAttributeName = new NSString(NSStrikethroughColorAttributeName());
+/** @method flags=const */
 public static final native int /*long*/ NSStrikethroughStyleAttributeName();
 public static final NSString NSStrikethroughStyleAttributeName = new NSString(NSStrikethroughStyleAttributeName());
+/** @method flags=const */
 public static final native int /*long*/ NSStringPboardType();
 public static final NSString NSStringPboardType = new NSString(NSStringPboardType());
+/** @method flags=const */
 public static final native int /*long*/ NSTIFFPboardType();
 public static final NSString NSTIFFPboardType = new NSString(NSTIFFPboardType());
+/** @method flags=const */
 public static final native int /*long*/ NSURLPboardType();
 public static final NSString NSURLPboardType = new NSString(NSURLPboardType());
+/** @method flags=const */
 public static final native int /*long*/ NSUnderlineColorAttributeName();
 public static final NSString NSUnderlineColorAttributeName = new NSString(NSUnderlineColorAttributeName());
+/** @method flags=const */
 public static final native int /*long*/ NSUnderlineStyleAttributeName();
 public static final NSString NSUnderlineStyleAttributeName = new NSString(NSUnderlineStyleAttributeName());
+/** @method flags=const */
 public static final native int /*long*/ NSDefaultRunLoopMode();
 public static final NSString NSDefaultRunLoopMode = new NSString(NSDefaultRunLoopMode());
+/** @method flags=const */
 public static final native int /*long*/ NSErrorFailingURLStringKey();
 public static final NSString NSErrorFailingURLStringKey = new NSString(NSErrorFailingURLStringKey());
 
 /** Functions */
+
+/**
+ * @param depth cast=(NSWindowDepth)
+ */
 public static final native int /*long*/ NSBitsPerPixelFromDepth(int depth);
+/**
+ * @param newCursorPosition flags=struct */
 public static final native int CGWarpMouseCursorPosition(CGPoint newCursorPosition);
+/**
+ * @param hfsFileTypeCode cast=(OSType)
+ */
 public static final native int /*long*/ NSFileTypeForHFSTypeCode(int hfsFileTypeCode);
+/**
+ * @param typePtr cast=(char*)
+ * @param sizep cast=(NSUInteger*)
+ * @param alignp cast=(NSUInteger*)
+ */
 public static final native int /*long*/ NSGetSizeAndAlignment(int /*long*/ typePtr, int[] /*long[]*/ sizep, int[] /*long[]*/ alignp);
+/**
+ * @param directory cast=(NSSearchPathDirectory)
+ * @param domainMask cast=(NSSearchPathDomainMask)
+ * @param expandTilde cast=(BOOL)
+ */
 public static final native int /*long*/ NSSearchPathForDirectoriesInDomains(int /*long*/ directory, int /*long*/ domainMask, boolean expandTilde);
 public static final native int /*long*/ NSTemporaryDirectory();
 
 /** Sends */
 
+/** @method flags=cast */
 public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long*/ sel);
+/** @method flags=cast */
 public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0);
+/** @method flags=cast */
 public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSAffineTransformStruct arg0);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ * @param arg1 flags=struct
+ * @param arg2 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSPoint arg1, NSPoint arg2);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ * @param arg1 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSPoint arg1, int /*long*/ arg2);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ * @param arg1 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSRect arg1, int /*long*/ arg2, float /*double*/ arg3);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, float /*double*/ arg1, float /*double*/ arg2, float /*double*/ arg3);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, float /*double*/ arg1, float /*double*/ arg2, float /*double*/ arg3, boolean arg4);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, int /*long*/ arg1, float[] /*double[]*/ arg2);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ * @param arg1 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0, NSPoint arg1);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0, int /*long*/ arg1);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ * @param arg1 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, NSPoint arg1);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ * @param arg1 flags=struct
+ * @param arg2 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, NSRange arg1, NSRect arg2);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ * @param arg1 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, NSRect arg1, int /*long*/ arg2, float /*double*/ arg3);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, boolean arg1);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, float /*double*/ arg1);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, float /*double*/ arg1, float /*double*/ arg2);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, boolean arg2, int /*long*/ arg3);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3, int /*long*/ arg4);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSSize arg0);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, boolean arg0);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, boolean arg0, int /*long*/ arg1);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, byte[] arg0);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, byte[] arg0, int /*long*/ arg1);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, char[] arg0);
+/**
+ * @method flags=cast
+ * @param arg1 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, char[] arg0, NSRange arg1);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, char[] arg0, int /*long*/ arg1);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, double arg0);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, double arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, boolean arg4);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float /*double*/ arg0, float /*double*/ arg1);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float /*double*/ arg0, float /*double*/ arg1, float /*double*/ arg2, float /*double*/ arg3);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float[] /*double[]*/ arg0);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float[] /*double[]*/ arg0, int /*long*/ arg1, float /*double*/ arg2);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0);
+/**
+ * @method flags=cast
+ * @param arg1 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1);
+/**
+ * @method flags=cast
+ * @param arg1 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1, int /*long*/ arg2, double arg3, int /*long*/ arg4, int /*long*/ arg5, short arg6, int /*long*/ arg7, int /*long*/ arg8);
+/**
+ * @method flags=cast
+ * @param arg1 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSRange arg1);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, boolean arg1);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, float /*double*/ arg1);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1);
+/**
+ * @method flags=cast
+ * @param arg2 flags=struct
+ */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, NSRange arg2);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, boolean arg2);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, boolean arg5, boolean arg6, int /*long*/ arg7, int /*long*/ arg8, int /*long*/ arg9);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, boolean arg5, boolean arg6, int /*long*/ arg7, int /*long*/ arg8, int /*long*/ arg9, int /*long*/ arg10);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int[] /*long[]*/ arg0, int /*long*/ arg1, int /*long*/ arg2);
+/** @method flags=cast */
 public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int[] arg0);
+/** @method flags=cast */
 public static final native int objc_msgSend(int id, int sel, float arg0);
+/** @method flags=cast */
 public static final native long objc_msgSend(long id, long sel, float arg0, double arg1);
+/** @method flags=cast */
 public static final native long objc_msgSend(long id, long sel, int arg0);
+/** @method flags=cast */
 public static final native void objc_msgSend_stret(NSAffineTransformStruct result, int /*long*/ id, int /*long*/ sel);
+/** @method flags=cast */
 public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel, NSPoint arg0);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel, NSPoint arg0, int /*long*/ arg1);
+/** @method flags=cast */
 public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0);
+/** @method flags=cast */
 public static final native void objc_msgSend_stret(NSRange result, int /*long*/ id, int /*long*/ sel);
+/** @method flags=cast */
 public static final native void objc_msgSend_stret(NSRange result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0);
+/** @method flags=cast */
 public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, NSRange arg0, int /*long*/ arg1);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, NSRect arg0);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1);
+/** @method flags=cast */
 public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0);
+/** @method flags=cast */
 public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1);
+/** @method flags=cast */
 public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, boolean arg2);
+/** @method flags=cast */
 public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0, boolean arg1, boolean arg2, int /*long*/ arg3);
+/**
+ * @method flags=cast
+ * @param arg0 flags=struct
+ */
 public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0, int /*long*/ arg1);
 
 /** Sizeof natives */
@@ -3018,21 +3360,86 @@ public static final native int NSRect_sizeof();
 public static final native int NSSize_sizeof();
 
 /** Memmove natives */
+
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(int /*long*/ dest, CGPoint src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(CGPoint dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(int /*long*/ dest, CGRect src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(CGRect dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(int /*long*/ dest, CGSize src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(CGSize dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(int /*long*/ dest, NSAffineTransformStruct src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(NSAffineTransformStruct dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(int /*long*/ dest, NSPoint src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(NSPoint dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(int /*long*/ dest, NSRange src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(NSRange dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(int /*long*/ dest, NSRect src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(NSRect dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(int /*long*/ dest, NSSize src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in critical
+ * @param src cast=(void *),flags=critical
+ */
 public static final native void memmove(NSSize dest, int /*long*/ src, int /*long*/ size);
 
 /** This section is auto generated */
diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/WebKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebKitFull.bridgesupport.extras
index 78c89594b2..78c89594b2 100644
--- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/WebKitFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebKitFull.bridgesupport.extras
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java
index 3e6c44406a..f2ba3117e6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java
@@ -10,6 +10,9 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
+/**
+ * @jniclass flags=no_gen
+ */
 public class id {
 
 public int /*long*/ id;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/objc_super.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/objc_super.java
index e0f9d001e8..37171c0609 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/objc_super.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/objc_super.java
@@ -10,8 +10,13 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
+/**
+ * @jniclass flags=struct
+ */
 public class objc_super {
+	/** @field cast=(id) */
 	public int /*long*/ receiver;
+	/** @field cast=(Class) */
 	public int /*long*/ super_class;
 	public static final int sizeof = OS.objc_super_sizeof();	
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c
index c5eacb310f..15cfa51e6d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c.c
@@ -29,7 +29,7 @@ JNIEXPORT jint JNICALL C_NATIVE(PTR_1sizeof)
 
 #ifndef NO_free
 JNIEXPORT void JNICALL C_NATIVE(free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	C_NATIVE_ENTER(env, that, free_FUNC);
 	free((void *)arg0);
@@ -38,14 +38,14 @@ JNIEXPORT void JNICALL C_NATIVE(free)
 #endif
 
 #ifndef NO_getenv
-JNIEXPORT jint JNICALL C_NATIVE(getenv)
+JNIEXPORT jintLong JNICALL C_NATIVE(getenv)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	C_NATIVE_ENTER(env, that, getenv_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)getenv((const char *)lparg0);
+	rc = (jintLong)getenv((const char *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	C_NATIVE_EXIT(env, that, getenv_FUNC);
@@ -54,33 +54,51 @@ fail:
 #endif
 
 #ifndef NO_malloc
-JNIEXPORT jint JNICALL C_NATIVE(malloc)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL C_NATIVE(malloc)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	C_NATIVE_ENTER(env, that, malloc_FUNC);
-	rc = (jint)malloc(arg0);
+	rc = (jintLong)malloc(arg0);
 	C_NATIVE_EXIT(env, that, malloc_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_memmove__III
-JNIEXPORT void JNICALL C_NATIVE(memmove__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__III) && !defined(JNI64)) || (!defined(NO_memmove__JJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove__JJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+#endif
 {
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove__III_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove__JJJ_FUNC);
+#endif
 	memmove((void *)arg0, (const void *)arg1, (size_t)arg2);
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__III_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove__JJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__I_3BI
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+#if (!defined(NO_memmove__I_3BI) && !defined(JNI64)) || (!defined(NO_memmove__J_3BJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove__I_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove__J_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
+#endif
 {
 	jbyte *lparg1=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove__I_3BI_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove__J_3BJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -99,16 +117,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3BI_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove__J_3BJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__I_3CI
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3CI)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2)
+#if (!defined(NO_memmove__I_3CI) && !defined(JNI64)) || (!defined(NO_memmove__J_3CJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove__I_3CI)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove__J_3CJ)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2)
+#endif
 {
 	jchar *lparg1=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove__I_3CI_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove__J_3CJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -127,16 +156,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3CI_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove__J_3CJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__I_3DI
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3DI)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jint arg2)
+#if (!defined(NO_memmove__I_3DI) && !defined(JNI64)) || (!defined(NO_memmove__J_3DJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove__I_3DI)(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove__J_3DJ)(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jintLong arg2)
+#endif
 {
 	jdouble *lparg1=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove__I_3DI_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove__J_3DJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -155,16 +195,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3DI_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove__J_3DJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__I_3FI
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3FI)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2)
+#if (!defined(NO_memmove__I_3FI) && !defined(JNI64)) || (!defined(NO_memmove__J_3FJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove__I_3FI)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove__J_3FJ)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jintLong arg2)
+#endif
 {
 	jfloat *lparg1=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove__I_3FI_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove__J_3FJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -183,16 +234,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3FI_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove__J_3FJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__I_3II
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3II)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
+#if (!defined(NO_memmove__I_3II) && !defined(JNI64)) || (!defined(NO_memmove__J_3IJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove__I_3II)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove__J_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintLong arg2)
+#endif
 {
 	jint *lparg1=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove__I_3II_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove__J_3IJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -211,16 +273,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3II_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove__J_3IJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__I_3JI
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3JI)
-	(JNIEnv *env, jclass that, jint arg0, jlongArray arg1, jint arg2)
+#if (!defined(NO_memmove__I_3JI) && !defined(JNI64)) || (!defined(NO_memmove__J_3JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove__I_3JI)(JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove__J_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1, jintLong arg2)
+#endif
 {
 	jlong *lparg1=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove__I_3JI_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove__J_3JJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -239,16 +312,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3JI_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove__J_3JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__I_3SI
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3SI)
-	(JNIEnv *env, jclass that, jint arg0, jshortArray arg1, jint arg2)
+#if (!defined(NO_memmove__I_3SI) && !defined(JNI64)) || (!defined(NO_memmove__J_3SJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove__I_3SI)(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove__J_3SJ)(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1, jintLong arg2)
+#endif
 {
 	jshort *lparg1=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove__I_3SI_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove__J_3SJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -267,16 +351,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseShortArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove__I_3SI_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove__J_3SJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove___3BII
-JNIEXPORT void JNICALL C_NATIVE(memmove___3BII)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove___3BII) && !defined(JNI64)) || (!defined(NO_memmove___3BJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove___3BII)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove___3BJJ)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	jbyte *lparg0=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove___3BII_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove___3BJJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -295,17 +390,28 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3BII_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove___3BJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove___3B_3CI
-JNIEXPORT void JNICALL C_NATIVE(memmove___3B_3CI)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jcharArray arg1, jint arg2)
+#if (!defined(NO_memmove___3B_3CI) && !defined(JNI64)) || (!defined(NO_memmove___3B_3CJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove___3B_3CI)(JNIEnv *env, jclass that, jbyteArray arg0, jcharArray arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove___3B_3CJ)(JNIEnv *env, jclass that, jbyteArray arg0, jcharArray arg1, jintLong arg2)
+#endif
 {
 	jbyte *lparg0=NULL;
 	jchar *lparg1=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove___3B_3CI_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove___3B_3CJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -328,16 +434,27 @@ fail:
 		if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, JNI_ABORT);
 		if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3B_3CI_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove___3B_3CJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove___3CII
-JNIEXPORT void JNICALL C_NATIVE(memmove___3CII)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove___3CII) && !defined(JNI64)) || (!defined(NO_memmove___3CJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove___3CII)(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove___3CJJ)(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	jchar *lparg0=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove___3CII_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove___3CJJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -356,16 +473,27 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3CII_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove___3CJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove___3DII
-JNIEXPORT void JNICALL C_NATIVE(memmove___3DII)
-	(JNIEnv *env, jclass that, jdoubleArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove___3DII) && !defined(JNI64)) || (!defined(NO_memmove___3DJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove___3DII)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove___3DJJ)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	jdouble *lparg0=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove___3DII_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove___3DJJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -384,16 +512,27 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3DII_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove___3DJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove___3FII
-JNIEXPORT void JNICALL C_NATIVE(memmove___3FII)
-	(JNIEnv *env, jclass that, jfloatArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove___3FII) && !defined(JNI64)) || (!defined(NO_memmove___3FJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove___3FII)(JNIEnv *env, jclass that, jfloatArray arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove___3FJJ)(JNIEnv *env, jclass that, jfloatArray arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	jfloat *lparg0=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove___3FII_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove___3FJJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -412,16 +551,27 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3FII_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove___3FJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove___3III
-JNIEXPORT void JNICALL C_NATIVE(memmove___3III)
-	(JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove___3III) && !defined(JNI64)) || (!defined(NO_memmove___3IJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove___3III)(JNIEnv *env, jclass that, jintArray arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove___3IJJ)(JNIEnv *env, jclass that, jintArray arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	jint *lparg0=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove___3III_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove___3IJJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -440,17 +590,28 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3III_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove___3IJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove___3I_3BI
-JNIEXPORT void JNICALL C_NATIVE(memmove___3I_3BI)
-	(JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jint arg2)
+#if (!defined(NO_memmove___3I_3BI) && !defined(JNI64)) || (!defined(NO_memmove___3I_3BJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove___3I_3BI)(JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove___3I_3BJ)(JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jintLong arg2)
+#endif
 {
 	jint *lparg0=NULL;
 	jbyte *lparg1=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove___3I_3BI_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove___3I_3BJ_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -471,16 +632,27 @@ fail:
 		if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
 	}
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3I_3BI_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove___3I_3BJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove___3JII
-JNIEXPORT void JNICALL C_NATIVE(memmove___3JII)
-	(JNIEnv *env, jclass that, jlongArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove___3JII) && !defined(JNI64)) || (!defined(NO_memmove___3JJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove___3JII)(JNIEnv *env, jclass that, jlongArray arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove___3JJJ)(JNIEnv *env, jclass that, jlongArray arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	jlong *lparg0=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove___3JII_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove___3JJJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -499,16 +671,27 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3JII_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove___3JJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove___3SII
-JNIEXPORT void JNICALL C_NATIVE(memmove___3SII)
-	(JNIEnv *env, jclass that, jshortArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove___3SII) && !defined(JNI64)) || (!defined(NO_memmove___3SJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL C_NATIVE(memmove___3SII)(JNIEnv *env, jclass that, jshortArray arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL C_NATIVE(memmove___3SJJ)(JNIEnv *env, jclass that, jshortArray arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	jshort *lparg0=NULL;
+#ifndef JNI64
 	C_NATIVE_ENTER(env, that, memmove___3SII_FUNC);
+#else
+	C_NATIVE_ENTER(env, that, memmove___3SJJ_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -527,17 +710,21 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseShortArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	C_NATIVE_EXIT(env, that, memmove___3SII_FUNC);
+#else
+	C_NATIVE_EXIT(env, that, memmove___3SJJ_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO_memset
-JNIEXPORT jint JNICALL C_NATIVE(memset)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL C_NATIVE(memset)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	C_NATIVE_ENTER(env, that, memset_FUNC);
-	rc = (jint)memset((void *)arg0, arg1, (size_t)arg2);
+	rc = (jintLong)memset((void *)arg0, arg1, (size_t)arg2);
 	C_NATIVE_EXIT(env, that, memset_FUNC);
 	return rc;
 }
@@ -545,7 +732,7 @@ JNIEXPORT jint JNICALL C_NATIVE(memset)
 
 #ifndef NO_strlen
 JNIEXPORT jint JNICALL C_NATIVE(strlen)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	C_NATIVE_ENTER(env, that, strlen_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c
index 6cb64d7db0..ee4a74d666 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.c
@@ -21,23 +21,91 @@ char * C_nativeFunctionNames[] = {
 	"free",
 	"getenv",
 	"malloc",
+#ifndef JNI64
 	"memmove__III",
+#else
+	"memmove__JJJ",
+#endif
+#ifndef JNI64
 	"memmove__I_3BI",
+#else
+	"memmove__J_3BJ",
+#endif
+#ifndef JNI64
 	"memmove__I_3CI",
+#else
+	"memmove__J_3CJ",
+#endif
+#ifndef JNI64
 	"memmove__I_3DI",
+#else
+	"memmove__J_3DJ",
+#endif
+#ifndef JNI64
 	"memmove__I_3FI",
+#else
+	"memmove__J_3FJ",
+#endif
+#ifndef JNI64
 	"memmove__I_3II",
+#else
+	"memmove__J_3IJ",
+#endif
+#ifndef JNI64
 	"memmove__I_3JI",
+#else
+	"memmove__J_3JJ",
+#endif
+#ifndef JNI64
 	"memmove__I_3SI",
+#else
+	"memmove__J_3SJ",
+#endif
+#ifndef JNI64
 	"memmove___3BII",
+#else
+	"memmove___3BJJ",
+#endif
+#ifndef JNI64
 	"memmove___3B_3CI",
+#else
+	"memmove___3B_3CJ",
+#endif
+#ifndef JNI64
 	"memmove___3CII",
+#else
+	"memmove___3CJJ",
+#endif
+#ifndef JNI64
 	"memmove___3DII",
+#else
+	"memmove___3DJJ",
+#endif
+#ifndef JNI64
 	"memmove___3FII",
+#else
+	"memmove___3FJJ",
+#endif
+#ifndef JNI64
 	"memmove___3III",
+#else
+	"memmove___3IJJ",
+#endif
+#ifndef JNI64
 	"memmove___3I_3BI",
+#else
+	"memmove___3I_3BJ",
+#endif
+#ifndef JNI64
 	"memmove___3JII",
+#else
+	"memmove___3JJJ",
+#endif
+#ifndef JNI64
 	"memmove___3SII",
+#else
+	"memmove___3SJJ",
+#endif
 	"memset",
 	"strlen",
 };
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.h
index 11002f789a..cc34b1cb8b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/library/c_stats.h
@@ -29,23 +29,91 @@ typedef enum {
 	free_FUNC,
 	getenv_FUNC,
 	malloc_FUNC,
+#ifndef JNI64
 	memmove__III_FUNC,
+#else
+	memmove__JJJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__I_3BI_FUNC,
+#else
+	memmove__J_3BJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__I_3CI_FUNC,
+#else
+	memmove__J_3CJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__I_3DI_FUNC,
+#else
+	memmove__J_3DJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__I_3FI_FUNC,
+#else
+	memmove__J_3FJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__I_3II_FUNC,
+#else
+	memmove__J_3IJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__I_3JI_FUNC,
+#else
+	memmove__J_3JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__I_3SI_FUNC,
+#else
+	memmove__J_3SJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove___3BII_FUNC,
+#else
+	memmove___3BJJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove___3B_3CI_FUNC,
+#else
+	memmove___3B_3CJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove___3CII_FUNC,
+#else
+	memmove___3CJJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove___3DII_FUNC,
+#else
+	memmove___3DJJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove___3FII_FUNC,
+#else
+	memmove___3FJJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove___3III_FUNC,
+#else
+	memmove___3IJJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove___3I_3BI_FUNC,
+#else
+	memmove___3I_3BJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove___3JII_FUNC,
+#else
+	memmove___3JJJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove___3SII_FUNC,
+#else
+	memmove___3SJJ_FUNC,
+#endif
 	memset_FUNC,
 	strlen_FUNC,
 } C_FUNCS;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c
index 2e9febd3ce..b663012f2d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c
@@ -44,72 +44,72 @@ JNIEXPORT jint JNICALL ATK_NATIVE(AtkObjectFactory_1sizeof)
 #endif
 
 #ifndef NO__1ATK_1ACTION_1GET_1IFACE
-JNIEXPORT jint JNICALL ATK_NATIVE(_1ATK_1ACTION_1GET_1IFACE)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1ACTION_1GET_1IFACE)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1ATK_1ACTION_1GET_1IFACE_FUNC);
-	rc = (jint)ATK_ACTION_GET_IFACE(arg0);
+	rc = (jintLong)ATK_ACTION_GET_IFACE(arg0);
 	ATK_NATIVE_EXIT(env, that, _1ATK_1ACTION_1GET_1IFACE_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1ATK_1COMPONENT_1GET_1IFACE
-JNIEXPORT jint JNICALL ATK_NATIVE(_1ATK_1COMPONENT_1GET_1IFACE)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1COMPONENT_1GET_1IFACE)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1ATK_1COMPONENT_1GET_1IFACE_FUNC);
-	rc = (jint)ATK_COMPONENT_GET_IFACE(arg0);
+	rc = (jintLong)ATK_COMPONENT_GET_IFACE(arg0);
 	ATK_NATIVE_EXIT(env, that, _1ATK_1COMPONENT_1GET_1IFACE_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1ATK_1OBJECT_1FACTORY_1CLASS
-JNIEXPORT jint JNICALL ATK_NATIVE(_1ATK_1OBJECT_1FACTORY_1CLASS)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1OBJECT_1FACTORY_1CLASS)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1ATK_1OBJECT_1FACTORY_1CLASS_FUNC);
-	rc = (jint)ATK_OBJECT_FACTORY_CLASS(arg0);
+	rc = (jintLong)ATK_OBJECT_FACTORY_CLASS(arg0);
 	ATK_NATIVE_EXIT(env, that, _1ATK_1OBJECT_1FACTORY_1CLASS_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1ATK_1SELECTION_1GET_1IFACE
-JNIEXPORT jint JNICALL ATK_NATIVE(_1ATK_1SELECTION_1GET_1IFACE)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1SELECTION_1GET_1IFACE)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1ATK_1SELECTION_1GET_1IFACE_FUNC);
-	rc = (jint)ATK_SELECTION_GET_IFACE(arg0);
+	rc = (jintLong)ATK_SELECTION_GET_IFACE(arg0);
 	ATK_NATIVE_EXIT(env, that, _1ATK_1SELECTION_1GET_1IFACE_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1ATK_1TEXT_1GET_1IFACE
-JNIEXPORT jint JNICALL ATK_NATIVE(_1ATK_1TEXT_1GET_1IFACE)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1TEXT_1GET_1IFACE)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1ATK_1TEXT_1GET_1IFACE_FUNC);
-	rc = (jint)ATK_TEXT_GET_IFACE(arg0);
+	rc = (jintLong)ATK_TEXT_GET_IFACE(arg0);
 	ATK_NATIVE_EXIT(env, that, _1ATK_1TEXT_1GET_1IFACE_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1ACCESSIBLE
-JNIEXPORT jint JNICALL ATK_NATIVE(_1GTK_1ACCESSIBLE)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1GTK_1ACCESSIBLE)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1GTK_1ACCESSIBLE_FUNC);
-	rc = (jint)GTK_ACCESSIBLE(arg0);
+	rc = (jintLong)GTK_ACCESSIBLE(arg0);
 	ATK_NATIVE_EXIT(env, that, _1GTK_1ACCESSIBLE_FUNC);
 	return rc;
 }
@@ -117,7 +117,7 @@ JNIEXPORT jint JNICALL ATK_NATIVE(_1GTK_1ACCESSIBLE)
 
 #ifndef NO__1atk_1focus_1tracker_1notify
 JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1focus_1tracker_1notify)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	ATK_NATIVE_ENTER(env, that, _1atk_1focus_1tracker_1notify_FUNC);
 	atk_focus_tracker_notify((AtkObject *)arg0);
@@ -126,36 +126,36 @@ JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1focus_1tracker_1notify)
 #endif
 
 #ifndef NO__1atk_1get_1default_1registry
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1get_1default_1registry)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1get_1default_1registry)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1atk_1get_1default_1registry_FUNC);
-	rc = (jint)atk_get_default_registry();
+	rc = (jintLong)atk_get_default_registry();
 	ATK_NATIVE_EXIT(env, that, _1atk_1get_1default_1registry_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1atk_1object_1factory_1create_1accessible
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1object_1factory_1create_1accessible)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1object_1factory_1create_1accessible)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1atk_1object_1factory_1create_1accessible_FUNC);
-	rc = (jint)atk_object_factory_create_accessible((AtkObjectFactory *)arg0, (GObject *)arg1);
+	rc = (jintLong)atk_object_factory_create_accessible((AtkObjectFactory *)arg0, (GObject *)arg1);
 	ATK_NATIVE_EXIT(env, that, _1atk_1object_1factory_1create_1accessible_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1atk_1object_1factory_1get_1accessible_1type
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1object_1factory_1get_1accessible_1type)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1object_1factory_1get_1accessible_1type)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1atk_1object_1factory_1get_1accessible_1type_FUNC);
-	rc = (jint)atk_object_factory_get_accessible_type((AtkObjectFactory *)arg0);
+	rc = (jintLong)atk_object_factory_get_accessible_type((AtkObjectFactory *)arg0);
 	ATK_NATIVE_EXIT(env, that, _1atk_1object_1factory_1get_1accessible_1type_FUNC);
 	return rc;
 }
@@ -163,7 +163,7 @@ JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1object_1factory_1get_1accessible_1type)
 
 #ifndef NO__1atk_1object_1initialize
 JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1object_1initialize)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	ATK_NATIVE_ENTER(env, that, _1atk_1object_1initialize_FUNC);
 	atk_object_initialize((AtkObject *)arg0, (gpointer)arg1);
@@ -172,24 +172,24 @@ JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1object_1initialize)
 #endif
 
 #ifndef NO__1atk_1object_1ref_1relation_1set
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1object_1ref_1relation_1set)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1object_1ref_1relation_1set)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1atk_1object_1ref_1relation_1set_FUNC);
-	rc = (jint)atk_object_ref_relation_set((AtkObject *)arg0);
+	rc = (jintLong)atk_object_ref_relation_set((AtkObject *)arg0);
 	ATK_NATIVE_EXIT(env, that, _1atk_1object_1ref_1relation_1set_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1atk_1registry_1get_1factory
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1registry_1get_1factory)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1registry_1get_1factory)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1atk_1registry_1get_1factory_FUNC);
-	rc = (jint)atk_registry_get_factory((AtkRegistry *)arg0, (GType)arg1);
+	rc = (jintLong)atk_registry_get_factory((AtkRegistry *)arg0, (GType)arg1);
 	ATK_NATIVE_EXIT(env, that, _1atk_1registry_1get_1factory_FUNC);
 	return rc;
 }
@@ -197,7 +197,7 @@ JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1registry_1get_1factory)
 
 #ifndef NO__1atk_1registry_1set_1factory_1type
 JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1registry_1set_1factory_1type)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	ATK_NATIVE_ENTER(env, that, _1atk_1registry_1set_1factory_1type_FUNC);
 	atk_registry_set_factory_type((AtkRegistry *)arg0, (GType)arg1, (GType)arg2);
@@ -207,7 +207,7 @@ JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1registry_1set_1factory_1type)
 
 #ifndef NO__1atk_1relation_1set_1get_1n_1relations
 JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1n_1relations)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1atk_1relation_1set_1get_1n_1relations_FUNC);
@@ -218,12 +218,12 @@ JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1n_1relations)
 #endif
 
 #ifndef NO__1atk_1relation_1set_1get_1relation
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1relation)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1relation)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1atk_1relation_1set_1get_1relation_FUNC);
-	rc = (jint)atk_relation_set_get_relation((AtkRelationSet *)arg0, arg1);
+	rc = (jintLong)atk_relation_set_get_relation((AtkRelationSet *)arg0, arg1);
 	ATK_NATIVE_EXIT(env, that, _1atk_1relation_1set_1get_1relation_FUNC);
 	return rc;
 }
@@ -231,7 +231,7 @@ JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1relation)
 
 #ifndef NO__1atk_1relation_1set_1remove
 JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1relation_1set_1remove)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	ATK_NATIVE_ENTER(env, that, _1atk_1relation_1set_1remove_FUNC);
 	atk_relation_set_remove((AtkRelationSet *)arg0, (AtkRelation *)arg1);
@@ -241,7 +241,7 @@ JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1relation_1set_1remove)
 
 #ifndef NO__1atk_1state_1set_1add_1state
 JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1state_1set_1add_1state)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1atk_1state_1set_1add_1state_FUNC);
@@ -252,236 +252,467 @@ JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1state_1set_1add_1state)
 #endif
 
 #ifndef NO__1atk_1state_1set_1new
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1state_1set_1new)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1state_1set_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	ATK_NATIVE_ENTER(env, that, _1atk_1state_1set_1new_FUNC);
-	rc = (jint)atk_state_set_new();
+	rc = (jintLong)atk_state_set_new();
 	ATK_NATIVE_EXIT(env, that, _1atk_1state_1set_1new_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO__1call__II
-JNIEXPORT jint JNICALL ATK_NATIVE(_1call__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO__1call__II) && !defined(JNI64)) || (!defined(NO__1call__JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, _1call__II_FUNC);
-	rc = (jint)((jint (*)())arg0)(arg1);
+#else
+	ATK_NATIVE_ENTER(env, that, _1call__JJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)())arg0)(arg1);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, _1call__II_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, _1call__JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO__1call__III
-JNIEXPORT jint JNICALL ATK_NATIVE(_1call__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO__1call__III) && !defined(JNI64)) || (!defined(NO__1call__JJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, _1call__III_FUNC);
-	rc = (jint)((jint (*)())arg0)(arg1, arg2);
+#else
+	ATK_NATIVE_ENTER(env, that, _1call__JJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, _1call__III_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, _1call__JJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO__1call__IIII
-JNIEXPORT jint JNICALL ATK_NATIVE(_1call__IIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO__1call__IIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, _1call__IIII_FUNC);
-	rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3);
+#else
+	ATK_NATIVE_ENTER(env, that, _1call__JJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, _1call__IIII_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, _1call__JJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO__1call__IIIII
-JNIEXPORT jint JNICALL ATK_NATIVE(_1call__IIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO__1call__IIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
+#else
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, _1call__IIIII_FUNC);
-	rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3, arg4);
+#else
+	ATK_NATIVE_ENTER(env, that, _1call__JJJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, _1call__IIIII_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, _1call__JJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO__1call__IIIIII
-JNIEXPORT jint JNICALL ATK_NATIVE(_1call__IIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO__1call__IIIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5)
+#else
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, _1call__IIIIII_FUNC);
-	rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3, arg4, arg5);
+#else
+	ATK_NATIVE_ENTER(env, that, _1call__JJJJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, _1call__IIIIII_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, _1call__JJJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO__1call__IIIIIII
-JNIEXPORT jint JNICALL ATK_NATIVE(_1call__IIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#if (!defined(NO__1call__IIIIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__IIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
+#else
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, _1call__IIIIIII_FUNC);
-	rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
+#else
+	ATK_NATIVE_ENTER(env, that, _1call__JJJJJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, _1call__IIIIIII_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, _1call__JJJJJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC);
+#endif
 	if (arg1) getAtkActionIfaceFields(env, arg1, (AtkActionIface *)arg0);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC);
+#endif
 	if (arg1) getAtkComponentIfaceFields(env, arg1, (AtkComponentIface *)arg0);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC);
+#endif
 	if (arg1) getAtkHypertextIfaceFields(env, arg1, (AtkHypertextIface *)arg0);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC);
+#endif
 	if (arg1) getAtkObjectClassFields(env, arg1, (AtkObjectClass *)arg0);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC);
+#endif
 	if (arg1) getAtkObjectFactoryClassFields(env, arg1, (AtkObjectFactoryClass *)arg0);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC);
+#endif
 	if (arg1) getAtkSelectionIfaceFields(env, arg1, (AtkSelectionIface *)arg0);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC);
+#endif
 	if (arg1) getAtkTextIfaceFields(env, arg1, (AtkTextIface *)arg0);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J_FUNC);
+#endif
 	if (arg0) setAtkActionIfaceFields(env, arg0, (AtkActionIface *)arg1);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J_FUNC);
+#endif
 	if (arg0) setAtkComponentIfaceFields(env, arg0, (AtkComponentIface *)arg1);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J_FUNC);
+#endif
 	if (arg0) setAtkHypertextIfaceFields(env, arg0, (AtkHypertextIface *)arg1);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J_FUNC);
+#endif
 	if (arg0) setAtkObjectClassFields(env, arg0, (AtkObjectClass *)arg1);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J_FUNC);
+#endif
 	if (arg0) setAtkObjectFactoryClassFields(env, arg0, (AtkObjectFactoryClass *)arg1);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J_FUNC);
+#endif
 	if (arg0) setAtkSelectionIfaceFields(env, arg0, (AtkSelectionIface *)arg1);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J_FUNC);
+#endif
 	if (arg0) setAtkTextIfaceFields(env, arg0, (AtkTextIface *)arg1);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I_FUNC);
+#else
+	ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J_FUNC);
+#endif
 	if (arg0) setGtkAccessibleFields(env, arg0, (GtkAccessible *)arg1);
+#ifndef JNI64
 	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I_FUNC);
+#else
+	ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J_FUNC);
+#endif
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c
index c50be21127..0527eda396 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c
@@ -42,27 +42,111 @@ char * ATK_nativeFunctionNames[] = {
 	"_1atk_1relation_1set_1remove",
 	"_1atk_1state_1set_1add_1state",
 	"_1atk_1state_1set_1new",
+#ifndef JNI64
 	"_1call__II",
+#else
+	"_1call__JJ",
+#endif
+#ifndef JNI64
 	"_1call__III",
+#else
+	"_1call__JJJ",
+#endif
+#ifndef JNI64
 	"_1call__IIII",
+#else
+	"_1call__JJJJ",
+#endif
+#ifndef JNI64
 	"_1call__IIIII",
+#else
+	"_1call__JJJJJ",
+#endif
+#ifndef JNI64
 	"_1call__IIIIII",
+#else
+	"_1call__JJJJJJ",
+#endif
+#ifndef JNI64
 	"_1call__IIIIIII",
+#else
+	"_1call__JJJJJJJ",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2",
+#else
+	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2",
+#else
+	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2",
+#else
+	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2",
+#else
+	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2",
+#else
+	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2",
+#else
+	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2",
+#else
+	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J",
+#endif
 };
 
 #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h
index 1e3695e3a7..d4680abfb0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h
@@ -50,25 +50,109 @@ typedef enum {
 	_1atk_1relation_1set_1remove_FUNC,
 	_1atk_1state_1set_1add_1state_FUNC,
 	_1atk_1state_1set_1new_FUNC,
+#ifndef JNI64
 	_1call__II_FUNC,
+#else
+	_1call__JJ_FUNC,
+#endif
+#ifndef JNI64
 	_1call__III_FUNC,
+#else
+	_1call__JJJ_FUNC,
+#endif
+#ifndef JNI64
 	_1call__IIII_FUNC,
+#else
+	_1call__JJJJ_FUNC,
+#endif
+#ifndef JNI64
 	_1call__IIIII_FUNC,
+#else
+	_1call__JJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	_1call__IIIIII_FUNC,
+#else
+	_1call__JJJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	_1call__IIIIIII_FUNC,
+#else
+	_1call__JJJJJJJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J_FUNC,
+#endif
 } ATK_FUNCS;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c
index d3ca542b3a..cd9a5ed7db 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c
@@ -29,36 +29,36 @@ void cacheAtkActionIfaceFields(JNIEnv *env, jobject lpObject)
 {
 	if (AtkActionIfaceFc.cached) return;
 	AtkActionIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	AtkActionIfaceFc.do_action = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "do_action", "I");
-	AtkActionIfaceFc.get_n_actions = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_n_actions", "I");
-	AtkActionIfaceFc.get_description = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_description", "I");
-	AtkActionIfaceFc.get_name = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_name", "I");
-	AtkActionIfaceFc.get_keybinding = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_keybinding", "I");
-	AtkActionIfaceFc.set_description = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "set_description", "I");
+	AtkActionIfaceFc.do_action = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "do_action", I_J);
+	AtkActionIfaceFc.get_n_actions = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_n_actions", I_J);
+	AtkActionIfaceFc.get_description = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_description", I_J);
+	AtkActionIfaceFc.get_name = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_name", I_J);
+	AtkActionIfaceFc.get_keybinding = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_keybinding", I_J);
+	AtkActionIfaceFc.set_description = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "set_description", I_J);
 	AtkActionIfaceFc.cached = 1;
 }
 
 AtkActionIface *getAtkActionIfaceFields(JNIEnv *env, jobject lpObject, AtkActionIface *lpStruct)
 {
 	if (!AtkActionIfaceFc.cached) cacheAtkActionIfaceFields(env, lpObject);
-	lpStruct->do_action = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.do_action);
-	lpStruct->get_n_actions = (gint (*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.get_n_actions);
-	lpStruct->get_description = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.get_description);
-	lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.get_name);
-	lpStruct->get_keybinding = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.get_keybinding);
-	lpStruct->set_description = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.set_description);
+	lpStruct->do_action = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.do_action);
+	lpStruct->get_n_actions = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_n_actions);
+	lpStruct->get_description = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_description);
+	lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_name);
+	lpStruct->get_keybinding = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_keybinding);
+	lpStruct->set_description = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.set_description);
 	return lpStruct;
 }
 
 void setAtkActionIfaceFields(JNIEnv *env, jobject lpObject, AtkActionIface *lpStruct)
 {
 	if (!AtkActionIfaceFc.cached) cacheAtkActionIfaceFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, AtkActionIfaceFc.do_action, (jint)lpStruct->do_action);
-	(*env)->SetIntField(env, lpObject, AtkActionIfaceFc.get_n_actions, (jint)lpStruct->get_n_actions);
-	(*env)->SetIntField(env, lpObject, AtkActionIfaceFc.get_description, (jint)lpStruct->get_description);
-	(*env)->SetIntField(env, lpObject, AtkActionIfaceFc.get_name, (jint)lpStruct->get_name);
-	(*env)->SetIntField(env, lpObject, AtkActionIfaceFc.get_keybinding, (jint)lpStruct->get_keybinding);
-	(*env)->SetIntField(env, lpObject, AtkActionIfaceFc.set_description, (jint)lpStruct->set_description);
+	(*env)->SetIntLongField(env, lpObject, AtkActionIfaceFc.do_action, (jintLong)lpStruct->do_action);
+	(*env)->SetIntLongField(env, lpObject, AtkActionIfaceFc.get_n_actions, (jintLong)lpStruct->get_n_actions);
+	(*env)->SetIntLongField(env, lpObject, AtkActionIfaceFc.get_description, (jintLong)lpStruct->get_description);
+	(*env)->SetIntLongField(env, lpObject, AtkActionIfaceFc.get_name, (jintLong)lpStruct->get_name);
+	(*env)->SetIntLongField(env, lpObject, AtkActionIfaceFc.get_keybinding, (jintLong)lpStruct->get_keybinding);
+	(*env)->SetIntLongField(env, lpObject, AtkActionIfaceFc.set_description, (jintLong)lpStruct->set_description);
 }
 #endif
 
@@ -75,57 +75,57 @@ void cacheAtkComponentIfaceFields(JNIEnv *env, jobject lpObject)
 {
 	if (AtkComponentIfaceFc.cached) return;
 	AtkComponentIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	AtkComponentIfaceFc.add_focus_handler = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "add_focus_handler", "I");
-	AtkComponentIfaceFc.contains = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "contains", "I");
-	AtkComponentIfaceFc.ref_accessible_at_point = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "ref_accessible_at_point", "I");
-	AtkComponentIfaceFc.get_extents = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_extents", "I");
-	AtkComponentIfaceFc.get_position = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_position", "I");
-	AtkComponentIfaceFc.get_size = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_size", "I");
-	AtkComponentIfaceFc.grab_focus = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "grab_focus", "I");
-	AtkComponentIfaceFc.remove_focus_handler = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "remove_focus_handler", "I");
-	AtkComponentIfaceFc.set_extents = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_extents", "I");
-	AtkComponentIfaceFc.set_position = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_position", "I");
-	AtkComponentIfaceFc.set_size = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_size", "I");
-	AtkComponentIfaceFc.get_layer = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_layer", "I");
-	AtkComponentIfaceFc.get_mdi_zorder = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_mdi_zorder", "I");
+	AtkComponentIfaceFc.add_focus_handler = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "add_focus_handler", I_J);
+	AtkComponentIfaceFc.contains = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "contains", I_J);
+	AtkComponentIfaceFc.ref_accessible_at_point = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "ref_accessible_at_point", I_J);
+	AtkComponentIfaceFc.get_extents = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_extents", I_J);
+	AtkComponentIfaceFc.get_position = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_position", I_J);
+	AtkComponentIfaceFc.get_size = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_size", I_J);
+	AtkComponentIfaceFc.grab_focus = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "grab_focus", I_J);
+	AtkComponentIfaceFc.remove_focus_handler = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "remove_focus_handler", I_J);
+	AtkComponentIfaceFc.set_extents = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_extents", I_J);
+	AtkComponentIfaceFc.set_position = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_position", I_J);
+	AtkComponentIfaceFc.set_size = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_size", I_J);
+	AtkComponentIfaceFc.get_layer = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_layer", I_J);
+	AtkComponentIfaceFc.get_mdi_zorder = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_mdi_zorder", I_J);
 	AtkComponentIfaceFc.cached = 1;
 }
 
 AtkComponentIface *getAtkComponentIfaceFields(JNIEnv *env, jobject lpObject, AtkComponentIface *lpStruct)
 {
 	if (!AtkComponentIfaceFc.cached) cacheAtkComponentIfaceFields(env, lpObject);
-	lpStruct->add_focus_handler = (guint (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.add_focus_handler);
-	lpStruct->contains = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.contains);
-	lpStruct->ref_accessible_at_point = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point);
-	lpStruct->get_extents = (void (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_extents);
-	lpStruct->get_position = (void (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_position);
-	lpStruct->get_size = (void (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_size);
-	lpStruct->grab_focus = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.grab_focus);
-	lpStruct->remove_focus_handler = (void (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler);
-	lpStruct->set_extents = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.set_extents);
-	lpStruct->set_position = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.set_position);
-	lpStruct->set_size = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.set_size);
-	lpStruct->get_layer = (AtkLayer (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_layer);
-	lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder);
+	lpStruct->add_focus_handler = (guint (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.add_focus_handler);
+	lpStruct->contains = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.contains);
+	lpStruct->ref_accessible_at_point = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point);
+	lpStruct->get_extents = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_extents);
+	lpStruct->get_position = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_position);
+	lpStruct->get_size = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_size);
+	lpStruct->grab_focus = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.grab_focus);
+	lpStruct->remove_focus_handler = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler);
+	lpStruct->set_extents = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.set_extents);
+	lpStruct->set_position = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.set_position);
+	lpStruct->set_size = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.set_size);
+	lpStruct->get_layer = (AtkLayer (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_layer);
+	lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder);
 	return lpStruct;
 }
 
 void setAtkComponentIfaceFields(JNIEnv *env, jobject lpObject, AtkComponentIface *lpStruct)
 {
 	if (!AtkComponentIfaceFc.cached) cacheAtkComponentIfaceFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.add_focus_handler, (jint)lpStruct->add_focus_handler);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.contains, (jint)lpStruct->contains);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point, (jint)lpStruct->ref_accessible_at_point);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_extents, (jint)lpStruct->get_extents);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_position, (jint)lpStruct->get_position);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_size, (jint)lpStruct->get_size);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.grab_focus, (jint)lpStruct->grab_focus);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler, (jint)lpStruct->remove_focus_handler);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.set_extents, (jint)lpStruct->set_extents);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.set_position, (jint)lpStruct->set_position);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.set_size, (jint)lpStruct->set_size);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_layer, (jint)lpStruct->get_layer);
-	(*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder, (jint)lpStruct->get_mdi_zorder);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.add_focus_handler, (jintLong)lpStruct->add_focus_handler);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.contains, (jintLong)lpStruct->contains);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point, (jintLong)lpStruct->ref_accessible_at_point);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.get_extents, (jintLong)lpStruct->get_extents);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.get_position, (jintLong)lpStruct->get_position);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.get_size, (jintLong)lpStruct->get_size);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.grab_focus, (jintLong)lpStruct->grab_focus);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler, (jintLong)lpStruct->remove_focus_handler);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.set_extents, (jintLong)lpStruct->set_extents);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.set_position, (jintLong)lpStruct->set_position);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.set_size, (jintLong)lpStruct->set_size);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.get_layer, (jintLong)lpStruct->get_layer);
+	(*env)->SetIntLongField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder, (jintLong)lpStruct->get_mdi_zorder);
 }
 #endif
 
@@ -142,27 +142,27 @@ void cacheAtkHypertextIfaceFields(JNIEnv *env, jobject lpObject)
 {
 	if (AtkHypertextIfaceFc.cached) return;
 	AtkHypertextIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	AtkHypertextIfaceFc.get_link = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_link", "I");
-	AtkHypertextIfaceFc.get_n_links = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_n_links", "I");
-	AtkHypertextIfaceFc.get_link_index = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_link_index", "I");
+	AtkHypertextIfaceFc.get_link = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_link", I_J);
+	AtkHypertextIfaceFc.get_n_links = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_n_links", I_J);
+	AtkHypertextIfaceFc.get_link_index = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_link_index", I_J);
 	AtkHypertextIfaceFc.cached = 1;
 }
 
 AtkHypertextIface *getAtkHypertextIfaceFields(JNIEnv *env, jobject lpObject, AtkHypertextIface *lpStruct)
 {
 	if (!AtkHypertextIfaceFc.cached) cacheAtkHypertextIfaceFields(env, lpObject);
-	lpStruct->get_link = (AtkHyperlink *(*)())(*env)->GetIntField(env, lpObject, AtkHypertextIfaceFc.get_link);
-	lpStruct->get_n_links = (gint (*)())(*env)->GetIntField(env, lpObject, AtkHypertextIfaceFc.get_n_links);
-	lpStruct->get_link_index = (gint (*)())(*env)->GetIntField(env, lpObject, AtkHypertextIfaceFc.get_link_index);
+	lpStruct->get_link = (AtkHyperlink *(*)())(*env)->GetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_link);
+	lpStruct->get_n_links = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_n_links);
+	lpStruct->get_link_index = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_link_index);
 	return lpStruct;
 }
 
 void setAtkHypertextIfaceFields(JNIEnv *env, jobject lpObject, AtkHypertextIface *lpStruct)
 {
 	if (!AtkHypertextIfaceFc.cached) cacheAtkHypertextIfaceFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, AtkHypertextIfaceFc.get_link, (jint)lpStruct->get_link);
-	(*env)->SetIntField(env, lpObject, AtkHypertextIfaceFc.get_n_links, (jint)lpStruct->get_n_links);
-	(*env)->SetIntField(env, lpObject, AtkHypertextIfaceFc.get_link_index, (jint)lpStruct->get_link_index);
+	(*env)->SetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_link, (jintLong)lpStruct->get_link);
+	(*env)->SetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_n_links, (jintLong)lpStruct->get_n_links);
+	(*env)->SetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_link_index, (jintLong)lpStruct->get_link_index);
 }
 #endif
 
@@ -179,87 +179,87 @@ void cacheAtkObjectClassFields(JNIEnv *env, jobject lpObject)
 {
 	if (AtkObjectClassFc.cached) return;
 	AtkObjectClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	AtkObjectClassFc.get_name = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_name", "I");
-	AtkObjectClassFc.get_description = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_description", "I");
-	AtkObjectClassFc.get_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_parent", "I");
-	AtkObjectClassFc.get_n_children = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_n_children", "I");
-	AtkObjectClassFc.ref_child = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_child", "I");
-	AtkObjectClassFc.get_index_in_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_index_in_parent", "I");
-	AtkObjectClassFc.ref_relation_set = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_relation_set", "I");
-	AtkObjectClassFc.get_role = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_role", "I");
-	AtkObjectClassFc.get_layer = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_layer", "I");
-	AtkObjectClassFc.get_mdi_zorder = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_mdi_zorder", "I");
-	AtkObjectClassFc.ref_state_set = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_state_set", "I");
-	AtkObjectClassFc.set_name = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_name", "I");
-	AtkObjectClassFc.set_description = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_description", "I");
-	AtkObjectClassFc.set_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_parent", "I");
-	AtkObjectClassFc.set_role = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_role", "I");
-	AtkObjectClassFc.connect_property_change_handler = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "connect_property_change_handler", "I");
-	AtkObjectClassFc.remove_property_change_handler = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "remove_property_change_handler", "I");
-	AtkObjectClassFc.initialize = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "initialize", "I");
-	AtkObjectClassFc.children_changed = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "children_changed", "I");
-	AtkObjectClassFc.focus_event = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "focus_event", "I");
-	AtkObjectClassFc.property_change = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "property_change", "I");
-	AtkObjectClassFc.state_change = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "state_change", "I");
-	AtkObjectClassFc.visible_data_changed = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "visible_data_changed", "I");
+	AtkObjectClassFc.get_name = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_name", I_J);
+	AtkObjectClassFc.get_description = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_description", I_J);
+	AtkObjectClassFc.get_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_parent", I_J);
+	AtkObjectClassFc.get_n_children = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_n_children", I_J);
+	AtkObjectClassFc.ref_child = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_child", I_J);
+	AtkObjectClassFc.get_index_in_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_index_in_parent", I_J);
+	AtkObjectClassFc.ref_relation_set = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_relation_set", I_J);
+	AtkObjectClassFc.get_role = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_role", I_J);
+	AtkObjectClassFc.get_layer = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_layer", I_J);
+	AtkObjectClassFc.get_mdi_zorder = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_mdi_zorder", I_J);
+	AtkObjectClassFc.ref_state_set = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_state_set", I_J);
+	AtkObjectClassFc.set_name = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_name", I_J);
+	AtkObjectClassFc.set_description = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_description", I_J);
+	AtkObjectClassFc.set_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_parent", I_J);
+	AtkObjectClassFc.set_role = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_role", I_J);
+	AtkObjectClassFc.connect_property_change_handler = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "connect_property_change_handler", I_J);
+	AtkObjectClassFc.remove_property_change_handler = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "remove_property_change_handler", I_J);
+	AtkObjectClassFc.initialize = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "initialize", I_J);
+	AtkObjectClassFc.children_changed = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "children_changed", I_J);
+	AtkObjectClassFc.focus_event = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "focus_event", I_J);
+	AtkObjectClassFc.property_change = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "property_change", I_J);
+	AtkObjectClassFc.state_change = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "state_change", I_J);
+	AtkObjectClassFc.visible_data_changed = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "visible_data_changed", I_J);
 	AtkObjectClassFc.cached = 1;
 }
 
 AtkObjectClass *getAtkObjectClassFields(JNIEnv *env, jobject lpObject, AtkObjectClass *lpStruct)
 {
 	if (!AtkObjectClassFc.cached) cacheAtkObjectClassFields(env, lpObject);
-	lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_name);
-	lpStruct->get_description = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_description);
-	lpStruct->get_parent = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_parent);
-	lpStruct->get_n_children = (gint (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_n_children);
-	lpStruct->ref_child = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.ref_child);
-	lpStruct->get_index_in_parent = (gint (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_index_in_parent);
-	lpStruct->ref_relation_set = (AtkRelationSet *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.ref_relation_set);
-	lpStruct->get_role = (AtkRole (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_role);
-	lpStruct->get_layer = (AtkLayer (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_layer);
-	lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_mdi_zorder);
-	lpStruct->ref_state_set = (AtkStateSet *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.ref_state_set);
-	lpStruct->set_name = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.set_name);
-	lpStruct->set_description = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.set_description);
-	lpStruct->set_parent = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.set_parent);
-	lpStruct->set_role = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.set_role);
-	lpStruct->connect_property_change_handler = (guint (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.connect_property_change_handler);
-	lpStruct->remove_property_change_handler = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.remove_property_change_handler);
-	lpStruct->initialize = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.initialize);
-	lpStruct->children_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.children_changed);
-	lpStruct->focus_event = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.focus_event);
-	lpStruct->property_change = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.property_change);
-	lpStruct->state_change = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.state_change);
-	lpStruct->visible_data_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.visible_data_changed);
+	lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_name);
+	lpStruct->get_description = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_description);
+	lpStruct->get_parent = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_parent);
+	lpStruct->get_n_children = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_n_children);
+	lpStruct->ref_child = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_child);
+	lpStruct->get_index_in_parent = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_index_in_parent);
+	lpStruct->ref_relation_set = (AtkRelationSet *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_relation_set);
+	lpStruct->get_role = (AtkRole (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_role);
+	lpStruct->get_layer = (AtkLayer (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_layer);
+	lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_mdi_zorder);
+	lpStruct->ref_state_set = (AtkStateSet *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_state_set);
+	lpStruct->set_name = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_name);
+	lpStruct->set_description = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_description);
+	lpStruct->set_parent = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_parent);
+	lpStruct->set_role = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_role);
+	lpStruct->connect_property_change_handler = (guint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.connect_property_change_handler);
+	lpStruct->remove_property_change_handler = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.remove_property_change_handler);
+	lpStruct->initialize = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.initialize);
+	lpStruct->children_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.children_changed);
+	lpStruct->focus_event = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.focus_event);
+	lpStruct->property_change = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.property_change);
+	lpStruct->state_change = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.state_change);
+	lpStruct->visible_data_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.visible_data_changed);
 	return lpStruct;
 }
 
 void setAtkObjectClassFields(JNIEnv *env, jobject lpObject, AtkObjectClass *lpStruct)
 {
 	if (!AtkObjectClassFc.cached) cacheAtkObjectClassFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_name, (jint)lpStruct->get_name);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_description, (jint)lpStruct->get_description);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_parent, (jint)lpStruct->get_parent);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_n_children, (jint)lpStruct->get_n_children);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.ref_child, (jint)lpStruct->ref_child);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_index_in_parent, (jint)lpStruct->get_index_in_parent);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.ref_relation_set, (jint)lpStruct->ref_relation_set);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_role, (jint)lpStruct->get_role);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_layer, (jint)lpStruct->get_layer);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_mdi_zorder, (jint)lpStruct->get_mdi_zorder);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.ref_state_set, (jint)lpStruct->ref_state_set);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.set_name, (jint)lpStruct->set_name);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.set_description, (jint)lpStruct->set_description);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.set_parent, (jint)lpStruct->set_parent);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.set_role, (jint)lpStruct->set_role);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.connect_property_change_handler, (jint)lpStruct->connect_property_change_handler);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.remove_property_change_handler, (jint)lpStruct->remove_property_change_handler);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.initialize, (jint)lpStruct->initialize);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.children_changed, (jint)lpStruct->children_changed);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.focus_event, (jint)lpStruct->focus_event);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.property_change, (jint)lpStruct->property_change);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.state_change, (jint)lpStruct->state_change);
-	(*env)->SetIntField(env, lpObject, AtkObjectClassFc.visible_data_changed, (jint)lpStruct->visible_data_changed);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_name, (jintLong)lpStruct->get_name);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_description, (jintLong)lpStruct->get_description);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_parent, (jintLong)lpStruct->get_parent);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_n_children, (jintLong)lpStruct->get_n_children);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.ref_child, (jintLong)lpStruct->ref_child);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_index_in_parent, (jintLong)lpStruct->get_index_in_parent);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.ref_relation_set, (jintLong)lpStruct->ref_relation_set);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_role, (jintLong)lpStruct->get_role);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_layer, (jintLong)lpStruct->get_layer);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.get_mdi_zorder, (jintLong)lpStruct->get_mdi_zorder);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.ref_state_set, (jintLong)lpStruct->ref_state_set);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.set_name, (jintLong)lpStruct->set_name);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.set_description, (jintLong)lpStruct->set_description);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.set_parent, (jintLong)lpStruct->set_parent);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.set_role, (jintLong)lpStruct->set_role);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.connect_property_change_handler, (jintLong)lpStruct->connect_property_change_handler);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.remove_property_change_handler, (jintLong)lpStruct->remove_property_change_handler);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.initialize, (jintLong)lpStruct->initialize);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.children_changed, (jintLong)lpStruct->children_changed);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.focus_event, (jintLong)lpStruct->focus_event);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.property_change, (jintLong)lpStruct->property_change);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.state_change, (jintLong)lpStruct->state_change);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectClassFc.visible_data_changed, (jintLong)lpStruct->visible_data_changed);
 }
 #endif
 
@@ -276,27 +276,27 @@ void cacheAtkObjectFactoryClassFields(JNIEnv *env, jobject lpObject)
 {
 	if (AtkObjectFactoryClassFc.cached) return;
 	AtkObjectFactoryClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	AtkObjectFactoryClassFc.create_accessible = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "create_accessible", "I");
-	AtkObjectFactoryClassFc.invalidate = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "invalidate", "I");
-	AtkObjectFactoryClassFc.get_accessible_type = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "get_accessible_type", "I");
+	AtkObjectFactoryClassFc.create_accessible = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "create_accessible", I_J);
+	AtkObjectFactoryClassFc.invalidate = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "invalidate", I_J);
+	AtkObjectFactoryClassFc.get_accessible_type = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "get_accessible_type", I_J);
 	AtkObjectFactoryClassFc.cached = 1;
 }
 
 AtkObjectFactoryClass *getAtkObjectFactoryClassFields(JNIEnv *env, jobject lpObject, AtkObjectFactoryClass *lpStruct)
 {
 	if (!AtkObjectFactoryClassFc.cached) cacheAtkObjectFactoryClassFields(env, lpObject);
-	lpStruct->create_accessible = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkObjectFactoryClassFc.create_accessible);
-	lpStruct->invalidate = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectFactoryClassFc.invalidate);
-	lpStruct->get_accessible_type = (GType (*)())(*env)->GetIntField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type);
+	lpStruct->create_accessible = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectFactoryClassFc.create_accessible);
+	lpStruct->invalidate = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectFactoryClassFc.invalidate);
+	lpStruct->get_accessible_type = (GType (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type);
 	return lpStruct;
 }
 
 void setAtkObjectFactoryClassFields(JNIEnv *env, jobject lpObject, AtkObjectFactoryClass *lpStruct)
 {
 	if (!AtkObjectFactoryClassFc.cached) cacheAtkObjectFactoryClassFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, AtkObjectFactoryClassFc.create_accessible, (jint)lpStruct->create_accessible);
-	(*env)->SetIntField(env, lpObject, AtkObjectFactoryClassFc.invalidate, (jint)lpStruct->invalidate);
-	(*env)->SetIntField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type, (jint)lpStruct->get_accessible_type);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectFactoryClassFc.create_accessible, (jintLong)lpStruct->create_accessible);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectFactoryClassFc.invalidate, (jintLong)lpStruct->invalidate);
+	(*env)->SetIntLongField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type, (jintLong)lpStruct->get_accessible_type);
 }
 #endif
 
@@ -313,42 +313,42 @@ void cacheAtkSelectionIfaceFields(JNIEnv *env, jobject lpObject)
 {
 	if (AtkSelectionIfaceFc.cached) return;
 	AtkSelectionIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	AtkSelectionIfaceFc.add_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "add_selection", "I");
-	AtkSelectionIfaceFc.clear_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "clear_selection", "I");
-	AtkSelectionIfaceFc.ref_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "ref_selection", "I");
-	AtkSelectionIfaceFc.get_selection_count = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "get_selection_count", "I");
-	AtkSelectionIfaceFc.is_child_selected = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "is_child_selected", "I");
-	AtkSelectionIfaceFc.remove_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "remove_selection", "I");
-	AtkSelectionIfaceFc.select_all_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "select_all_selection", "I");
-	AtkSelectionIfaceFc.selection_changed = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "selection_changed", "I");
+	AtkSelectionIfaceFc.add_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "add_selection", I_J);
+	AtkSelectionIfaceFc.clear_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "clear_selection", I_J);
+	AtkSelectionIfaceFc.ref_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "ref_selection", I_J);
+	AtkSelectionIfaceFc.get_selection_count = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "get_selection_count", I_J);
+	AtkSelectionIfaceFc.is_child_selected = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "is_child_selected", I_J);
+	AtkSelectionIfaceFc.remove_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "remove_selection", I_J);
+	AtkSelectionIfaceFc.select_all_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "select_all_selection", I_J);
+	AtkSelectionIfaceFc.selection_changed = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "selection_changed", I_J);
 	AtkSelectionIfaceFc.cached = 1;
 }
 
 AtkSelectionIface *getAtkSelectionIfaceFields(JNIEnv *env, jobject lpObject, AtkSelectionIface *lpStruct)
 {
 	if (!AtkSelectionIfaceFc.cached) cacheAtkSelectionIfaceFields(env, lpObject);
-	lpStruct->add_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.add_selection);
-	lpStruct->clear_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.clear_selection);
-	lpStruct->ref_selection = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.ref_selection);
-	lpStruct->get_selection_count = (gint (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.get_selection_count);
-	lpStruct->is_child_selected = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.is_child_selected);
-	lpStruct->remove_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.remove_selection);
-	lpStruct->select_all_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.select_all_selection);
-	lpStruct->selection_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.selection_changed);
+	lpStruct->add_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.add_selection);
+	lpStruct->clear_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.clear_selection);
+	lpStruct->ref_selection = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.ref_selection);
+	lpStruct->get_selection_count = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.get_selection_count);
+	lpStruct->is_child_selected = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.is_child_selected);
+	lpStruct->remove_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.remove_selection);
+	lpStruct->select_all_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.select_all_selection);
+	lpStruct->selection_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.selection_changed);
 	return lpStruct;
 }
 
 void setAtkSelectionIfaceFields(JNIEnv *env, jobject lpObject, AtkSelectionIface *lpStruct)
 {
 	if (!AtkSelectionIfaceFc.cached) cacheAtkSelectionIfaceFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.add_selection, (jint)lpStruct->add_selection);
-	(*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.clear_selection, (jint)lpStruct->clear_selection);
-	(*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.ref_selection, (jint)lpStruct->ref_selection);
-	(*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.get_selection_count, (jint)lpStruct->get_selection_count);
-	(*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.is_child_selected, (jint)lpStruct->is_child_selected);
-	(*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.remove_selection, (jint)lpStruct->remove_selection);
-	(*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.select_all_selection, (jint)lpStruct->select_all_selection);
-	(*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.selection_changed, (jint)lpStruct->selection_changed);
+	(*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.add_selection, (jintLong)lpStruct->add_selection);
+	(*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.clear_selection, (jintLong)lpStruct->clear_selection);
+	(*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.ref_selection, (jintLong)lpStruct->ref_selection);
+	(*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.get_selection_count, (jintLong)lpStruct->get_selection_count);
+	(*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.is_child_selected, (jintLong)lpStruct->is_child_selected);
+	(*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.remove_selection, (jintLong)lpStruct->remove_selection);
+	(*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.select_all_selection, (jintLong)lpStruct->select_all_selection);
+	(*env)->SetIntLongField(env, lpObject, AtkSelectionIfaceFc.selection_changed, (jintLong)lpStruct->selection_changed);
 }
 #endif
 
@@ -365,78 +365,78 @@ void cacheAtkTextIfaceFields(JNIEnv *env, jobject lpObject)
 {
 	if (AtkTextIfaceFc.cached) return;
 	AtkTextIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	AtkTextIfaceFc.get_text = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text", "I");
-	AtkTextIfaceFc.get_text_after_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_after_offset", "I");
-	AtkTextIfaceFc.get_text_at_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_at_offset", "I");
-	AtkTextIfaceFc.get_character_at_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_at_offset", "I");
-	AtkTextIfaceFc.get_text_before_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_before_offset", "I");
-	AtkTextIfaceFc.get_caret_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_caret_offset", "I");
-	AtkTextIfaceFc.get_run_attributes = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_run_attributes", "I");
-	AtkTextIfaceFc.get_default_attributes = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_default_attributes", "I");
-	AtkTextIfaceFc.get_character_extents = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_extents", "I");
-	AtkTextIfaceFc.get_character_count = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_count", "I");
-	AtkTextIfaceFc.get_offset_at_point = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_offset_at_point", "I");
-	AtkTextIfaceFc.get_n_selections = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_n_selections", "I");
-	AtkTextIfaceFc.get_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_selection", "I");
-	AtkTextIfaceFc.add_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "add_selection", "I");
-	AtkTextIfaceFc.remove_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "remove_selection", "I");
-	AtkTextIfaceFc.set_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "set_selection", "I");
-	AtkTextIfaceFc.set_caret_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "set_caret_offset", "I");
-	AtkTextIfaceFc.text_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_changed", "I");
-	AtkTextIfaceFc.text_caret_moved = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_caret_moved", "I");
-	AtkTextIfaceFc.text_selection_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_selection_changed", "I");
+	AtkTextIfaceFc.get_text = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text", I_J);
+	AtkTextIfaceFc.get_text_after_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_after_offset", I_J);
+	AtkTextIfaceFc.get_text_at_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_at_offset", I_J);
+	AtkTextIfaceFc.get_character_at_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_at_offset", I_J);
+	AtkTextIfaceFc.get_text_before_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_before_offset", I_J);
+	AtkTextIfaceFc.get_caret_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_caret_offset", I_J);
+	AtkTextIfaceFc.get_run_attributes = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_run_attributes", I_J);
+	AtkTextIfaceFc.get_default_attributes = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_default_attributes", I_J);
+	AtkTextIfaceFc.get_character_extents = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_extents", I_J);
+	AtkTextIfaceFc.get_character_count = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_count", I_J);
+	AtkTextIfaceFc.get_offset_at_point = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_offset_at_point", I_J);
+	AtkTextIfaceFc.get_n_selections = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_n_selections", I_J);
+	AtkTextIfaceFc.get_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_selection", I_J);
+	AtkTextIfaceFc.add_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "add_selection", I_J);
+	AtkTextIfaceFc.remove_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "remove_selection", I_J);
+	AtkTextIfaceFc.set_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "set_selection", I_J);
+	AtkTextIfaceFc.set_caret_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "set_caret_offset", I_J);
+	AtkTextIfaceFc.text_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_changed", I_J);
+	AtkTextIfaceFc.text_caret_moved = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_caret_moved", I_J);
+	AtkTextIfaceFc.text_selection_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_selection_changed", I_J);
 	AtkTextIfaceFc.cached = 1;
 }
 
 AtkTextIface *getAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct)
 {
 	if (!AtkTextIfaceFc.cached) cacheAtkTextIfaceFields(env, lpObject);
-	lpStruct->get_text = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_text);
-	lpStruct->get_text_after_offset = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_text_after_offset);
-	lpStruct->get_text_at_offset = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_text_at_offset);
-	lpStruct->get_character_at_offset = (gunichar (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_character_at_offset);
-	lpStruct->get_text_before_offset = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_text_before_offset);
-	lpStruct->get_caret_offset = (gint (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_caret_offset);
-	lpStruct->get_run_attributes = (AtkAttributeSet *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_run_attributes);
-	lpStruct->get_default_attributes = (AtkAttributeSet *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_default_attributes);
-	lpStruct->get_character_extents = (void (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_character_extents);
-	lpStruct->get_character_count = (gint (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_character_count);
-	lpStruct->get_offset_at_point = (gint (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_offset_at_point);
-	lpStruct->get_n_selections = (gint (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_n_selections);
-	lpStruct->get_selection = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_selection);
-	lpStruct->add_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.add_selection);
-	lpStruct->remove_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.remove_selection);
-	lpStruct->set_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.set_selection);
-	lpStruct->set_caret_offset = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.set_caret_offset);
-	lpStruct->text_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.text_changed);
-	lpStruct->text_caret_moved = (void (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.text_caret_moved);
-	lpStruct->text_selection_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.text_selection_changed);
+	lpStruct->get_text = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text);
+	lpStruct->get_text_after_offset = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_after_offset);
+	lpStruct->get_text_at_offset = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_at_offset);
+	lpStruct->get_character_at_offset = (gunichar (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_at_offset);
+	lpStruct->get_text_before_offset = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_before_offset);
+	lpStruct->get_caret_offset = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_caret_offset);
+	lpStruct->get_run_attributes = (AtkAttributeSet *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_run_attributes);
+	lpStruct->get_default_attributes = (AtkAttributeSet *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_default_attributes);
+	lpStruct->get_character_extents = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_extents);
+	lpStruct->get_character_count = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_count);
+	lpStruct->get_offset_at_point = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_offset_at_point);
+	lpStruct->get_n_selections = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_n_selections);
+	lpStruct->get_selection = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_selection);
+	lpStruct->add_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.add_selection);
+	lpStruct->remove_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.remove_selection);
+	lpStruct->set_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.set_selection);
+	lpStruct->set_caret_offset = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.set_caret_offset);
+	lpStruct->text_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_changed);
+	lpStruct->text_caret_moved = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_caret_moved);
+	lpStruct->text_selection_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_selection_changed);
 	return lpStruct;
 }
 
 void setAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct)
 {
 	if (!AtkTextIfaceFc.cached) cacheAtkTextIfaceFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_text, (jint)lpStruct->get_text);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_text_after_offset, (jint)lpStruct->get_text_after_offset);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_text_at_offset, (jint)lpStruct->get_text_at_offset);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_character_at_offset, (jint)lpStruct->get_character_at_offset);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_text_before_offset, (jint)lpStruct->get_text_before_offset);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_caret_offset, (jint)lpStruct->get_caret_offset);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_run_attributes, (jint)lpStruct->get_run_attributes);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_default_attributes, (jint)lpStruct->get_default_attributes);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_character_extents, (jint)lpStruct->get_character_extents);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_character_count, (jint)lpStruct->get_character_count);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_offset_at_point, (jint)lpStruct->get_offset_at_point);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_n_selections, (jint)lpStruct->get_n_selections);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_selection, (jint)lpStruct->get_selection);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.add_selection, (jint)lpStruct->add_selection);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.remove_selection, (jint)lpStruct->remove_selection);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.set_selection, (jint)lpStruct->set_selection);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.set_caret_offset, (jint)lpStruct->set_caret_offset);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.text_changed, (jint)lpStruct->text_changed);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.text_caret_moved, (jint)lpStruct->text_caret_moved);
-	(*env)->SetIntField(env, lpObject, AtkTextIfaceFc.text_selection_changed, (jint)lpStruct->text_selection_changed);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_text, (jintLong)lpStruct->get_text);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_after_offset, (jintLong)lpStruct->get_text_after_offset);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_at_offset, (jintLong)lpStruct->get_text_at_offset);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_at_offset, (jintLong)lpStruct->get_character_at_offset);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_before_offset, (jintLong)lpStruct->get_text_before_offset);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_caret_offset, (jintLong)lpStruct->get_caret_offset);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_run_attributes, (jintLong)lpStruct->get_run_attributes);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_default_attributes, (jintLong)lpStruct->get_default_attributes);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_extents, (jintLong)lpStruct->get_character_extents);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_count, (jintLong)lpStruct->get_character_count);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_offset_at_point, (jintLong)lpStruct->get_offset_at_point);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_n_selections, (jintLong)lpStruct->get_n_selections);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.get_selection, (jintLong)lpStruct->get_selection);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.add_selection, (jintLong)lpStruct->add_selection);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.remove_selection, (jintLong)lpStruct->remove_selection);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.set_selection, (jintLong)lpStruct->set_selection);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.set_caret_offset, (jintLong)lpStruct->set_caret_offset);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.text_changed, (jintLong)lpStruct->text_changed);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.text_caret_moved, (jintLong)lpStruct->text_caret_moved);
+	(*env)->SetIntLongField(env, lpObject, AtkTextIfaceFc.text_selection_changed, (jintLong)lpStruct->text_selection_changed);
 }
 #endif
 
@@ -453,21 +453,21 @@ void cacheGtkAccessibleFields(JNIEnv *env, jobject lpObject)
 {
 	if (GtkAccessibleFc.cached) return;
 	GtkAccessibleFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GtkAccessibleFc.widget = (*env)->GetFieldID(env, GtkAccessibleFc.clazz, "widget", "I");
+	GtkAccessibleFc.widget = (*env)->GetFieldID(env, GtkAccessibleFc.clazz, "widget", I_J);
 	GtkAccessibleFc.cached = 1;
 }
 
 GtkAccessible *getGtkAccessibleFields(JNIEnv *env, jobject lpObject, GtkAccessible *lpStruct)
 {
 	if (!GtkAccessibleFc.cached) cacheGtkAccessibleFields(env, lpObject);
-	lpStruct->widget = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkAccessibleFc.widget);
+	lpStruct->widget = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkAccessibleFc.widget);
 	return lpStruct;
 }
 
 void setGtkAccessibleFields(JNIEnv *env, jobject lpObject, GtkAccessible *lpStruct)
 {
 	if (!GtkAccessibleFc.cached) cacheGtkAccessibleFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GtkAccessibleFc.widget, (jint)lpStruct->widget);
+	(*env)->SetIntLongField(env, lpObject, GtkAccessibleFc.widget, (jintLong)lpStruct->widget);
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
index b052c7772e..30da1d31b7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
@@ -66,7 +66,7 @@ esac
 
 # For 64-bit CPUs, we have a switch
 if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then
-	SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
+	SWT_PTR_CFLAGS=-DJNI64
 	export SWT_PTR_CFLAGS
 	if [ -d /lib64 ]; then
 		XLIB64=-L/usr/X11R6/lib64
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index 0ad01b63e8..caa2f4d31c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -21,7 +21,7 @@
 
 #ifndef NO_Call
 JNIEXPORT jint JNICALL OS_NATIVE(Call)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, Call_FUNC);
@@ -33,7 +33,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(Call)
 
 #ifndef NO_GDK_1EVENT_1TYPE
 JNIEXPORT jint JNICALL OS_NATIVE(GDK_1EVENT_1TYPE)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GDK_1EVENT_1TYPE_FUNC);
@@ -44,12 +44,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GDK_1EVENT_1TYPE)
 #endif
 
 #ifndef NO_GDK_1EVENT_1WINDOW
-JNIEXPORT jint JNICALL OS_NATIVE(GDK_1EVENT_1WINDOW)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GDK_1EVENT_1WINDOW)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GDK_1EVENT_1WINDOW_FUNC);
-	rc = (jint)GDK_EVENT_WINDOW((GdkEventAny *)arg0);
+	rc = (jintLong)GDK_EVENT_WINDOW((GdkEventAny *)arg0);
 	OS_NATIVE_EXIT(env, that, GDK_1EVENT_1WINDOW_FUNC);
 	return rc;
 }
@@ -80,12 +80,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GPollFD_1sizeof)
 #endif
 
 #ifndef NO_GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING_FUNC);
-	rc = (jint)GTK_ACCEL_LABEL_GET_ACCEL_STRING((GtkAccelLabel *)arg0);
+	rc = (jintLong)GTK_ACCEL_LABEL_GET_ACCEL_STRING((GtkAccelLabel *)arg0);
 	OS_NATIVE_EXIT(env, that, GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING_FUNC);
 	return rc;
 }
@@ -93,7 +93,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING)
 
 #ifndef NO_GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING
 JNIEXPORT void JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING_FUNC);
 	GTK_ACCEL_LABEL_SET_ACCEL_STRING((GtkAccelLabel *)arg0, (gchar *)arg1);
@@ -102,24 +102,24 @@ JNIEXPORT void JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING)
 #endif
 
 #ifndef NO_GTK_1ENTRY_1IM_1CONTEXT
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1ENTRY_1IM_1CONTEXT)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1ENTRY_1IM_1CONTEXT)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1ENTRY_1IM_1CONTEXT_FUNC);
-	rc = (jint)GTK_ENTRY_IM_CONTEXT((GtkEntry *)arg0);
+	rc = (jintLong)GTK_ENTRY_IM_CONTEXT((GtkEntry *)arg0);
 	OS_NATIVE_EXIT(env, that, GTK_1ENTRY_1IM_1CONTEXT_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GTK_1SCROLLED_1WINDOW_1HSCROLLBAR
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1HSCROLLBAR)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1HSCROLLBAR)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1SCROLLED_1WINDOW_1HSCROLLBAR_FUNC);
-	rc = (jint)GTK_SCROLLED_WINDOW_HSCROLLBAR((GtkScrolledWindow *)arg0);
+	rc = (jintLong)GTK_SCROLLED_WINDOW_HSCROLLBAR((GtkScrolledWindow *)arg0);
 	OS_NATIVE_EXIT(env, that, GTK_1SCROLLED_1WINDOW_1HSCROLLBAR_FUNC);
 	return rc;
 }
@@ -127,7 +127,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1HSCROLLBAR)
 
 #ifndef NO_GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING
 JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING_FUNC);
@@ -138,24 +138,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING)
 #endif
 
 #ifndef NO_GTK_1SCROLLED_1WINDOW_1VSCROLLBAR
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1VSCROLLBAR)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1VSCROLLBAR)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1SCROLLED_1WINDOW_1VSCROLLBAR_FUNC);
-	rc = (jint)GTK_SCROLLED_WINDOW_VSCROLLBAR((GtkScrolledWindow *)arg0);
+	rc = (jintLong)GTK_SCROLLED_WINDOW_VSCROLLBAR((GtkScrolledWindow *)arg0);
 	OS_NATIVE_EXIT(env, that, GTK_1SCROLLED_1WINDOW_1VSCROLLBAR_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GTK_1TEXTVIEW_1IM_1CONTEXT
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1TEXTVIEW_1IM_1CONTEXT_FUNC);
-	rc = (jint)GTK_TEXTVIEW_IM_CONTEXT((GtkTextView *)arg0);
+	rc = (jintLong)GTK_TEXTVIEW_IM_CONTEXT((GtkTextView *)arg0);
 	OS_NATIVE_EXIT(env, that, GTK_1TEXTVIEW_1IM_1CONTEXT_FUNC);
 	return rc;
 }
@@ -163,7 +163,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT)
 
 #ifndef NO_GTK_1TOOLTIPS_1SET_1ACTIVE
 JNIEXPORT void JNICALL OS_NATIVE(GTK_1TOOLTIPS_1SET_1ACTIVE)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, GTK_1TOOLTIPS_1SET_1ACTIVE_FUNC);
 	GTK_TOOLTIPS_SET_ACTIVE((GtkTooltips *)arg0, (GtkTooltipsData *)arg1);
@@ -172,12 +172,12 @@ JNIEXPORT void JNICALL OS_NATIVE(GTK_1TOOLTIPS_1SET_1ACTIVE)
 #endif
 
 #ifndef NO_GTK_1TOOLTIPS_1TIP_1WINDOW
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1TOOLTIPS_1TIP_1WINDOW)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1TOOLTIPS_1TIP_1WINDOW)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1TOOLTIPS_1TIP_1WINDOW_FUNC);
-	rc = (jint)GTK_TOOLTIPS_TIP_WINDOW((GtkTooltips *)arg0);
+	rc = (jintLong)GTK_TOOLTIPS_TIP_WINDOW((GtkTooltips *)arg0);
 	OS_NATIVE_EXIT(env, that, GTK_1TOOLTIPS_1TIP_1WINDOW_FUNC);
 	return rc;
 }
@@ -185,7 +185,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1TOOLTIPS_1TIP_1WINDOW)
 
 #ifndef NO_GTK_1WIDGET_1HEIGHT
 JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1HEIGHT)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1HEIGHT_FUNC);
@@ -197,7 +197,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1HEIGHT)
 
 #ifndef NO_GTK_1WIDGET_1REQUISITION_1HEIGHT
 JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1HEIGHT)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1REQUISITION_1HEIGHT_FUNC);
@@ -209,7 +209,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1HEIGHT)
 
 #ifndef NO_GTK_1WIDGET_1REQUISITION_1WIDTH
 JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1WIDTH)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1REQUISITION_1WIDTH_FUNC);
@@ -221,7 +221,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1WIDTH)
 
 #ifndef NO_GTK_1WIDGET_1SET_1HEIGHT
 JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1HEIGHT)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1HEIGHT_FUNC);
 	GTK_WIDGET_SET_HEIGHT((GtkWidget *)arg0, arg1);
@@ -231,7 +231,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1HEIGHT)
 
 #ifndef NO_GTK_1WIDGET_1SET_1WIDTH
 JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1WIDTH)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1WIDTH_FUNC);
 	GTK_WIDGET_SET_WIDTH((GtkWidget *)arg0, arg1);
@@ -241,7 +241,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1WIDTH)
 
 #ifndef NO_GTK_1WIDGET_1SET_1X
 JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1X)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1X_FUNC);
 	GTK_WIDGET_SET_X((GtkWidget *)arg0, arg1);
@@ -251,7 +251,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1X)
 
 #ifndef NO_GTK_1WIDGET_1SET_1Y
 JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1Y)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1Y_FUNC);
 	GTK_WIDGET_SET_Y((GtkWidget *)arg0, arg1);
@@ -261,7 +261,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1Y)
 
 #ifndef NO_GTK_1WIDGET_1WIDTH
 JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WIDTH)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1WIDTH_FUNC);
@@ -272,12 +272,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WIDTH)
 #endif
 
 #ifndef NO_GTK_1WIDGET_1WINDOW
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WINDOW)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1WIDGET_1WINDOW)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1WINDOW_FUNC);
-	rc = (jint)GTK_WIDGET_WINDOW((GtkWidget *)arg0);
+	rc = (jintLong)GTK_WIDGET_WINDOW((GtkWidget *)arg0);
 	OS_NATIVE_EXIT(env, that, GTK_1WIDGET_1WINDOW_FUNC);
 	return rc;
 }
@@ -285,7 +285,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WINDOW)
 
 #ifndef NO_GTK_1WIDGET_1X
 JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1X)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1X_FUNC);
@@ -297,7 +297,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1X)
 
 #ifndef NO_GTK_1WIDGET_1Y
 JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1Y)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1Y_FUNC);
@@ -1017,7 +1017,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(XWindowChanges_1sizeof)
 
 #ifndef NO_X_1EVENT_1TYPE
 JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1TYPE)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, X_1EVENT_1TYPE_FUNC);
@@ -1028,12 +1028,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1TYPE)
 #endif
 
 #ifndef NO_X_1EVENT_1WINDOW
-JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1WINDOW)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(X_1EVENT_1WINDOW)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, X_1EVENT_1WINDOW_FUNC);
-	rc = (jint)X_EVENT_WINDOW((XAnyEvent *)arg0);
+	rc = (jintLong)X_EVENT_WINDOW((XAnyEvent *)arg0);
 	OS_NATIVE_EXIT(env, that, X_1EVENT_1WINDOW_FUNC);
 	return rc;
 }
@@ -1041,7 +1041,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1WINDOW)
 
 #ifndef NO__1Call
 JNIEXPORT jint JNICALL OS_NATIVE(_1Call)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1Call_FUNC);
@@ -1053,7 +1053,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1Call)
 
 #ifndef NO__1FcConfigAppFontAddFile
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1FcConfigAppFontAddFile)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	jboolean rc = 0;
@@ -1063,18 +1063,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1FcConfigAppFontAddFile)
 	rc = (jboolean)FcConfigAppFontAddFile(arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(jint, jbyte *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(FcConfigAppFontAddFile_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "FcConfigAppFontAddFile");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)(arg0, lparg1);
+		LOAD_FUNCTION(fp, FcConfigAppFontAddFile)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -1085,60 +1076,60 @@ fail:
 #endif
 
 #ifndef NO__1GDK_1DISPLAY
-JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1DISPLAY)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1DISPLAY)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GDK_1DISPLAY_FUNC);
-	rc = (jint)GDK_DISPLAY();
+	rc = (jintLong)GDK_DISPLAY();
 	OS_NATIVE_EXIT(env, that, _1GDK_1DISPLAY_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GDK_1PIXMAP_1XID
-JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1PIXMAP_1XID)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1PIXMAP_1XID)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GDK_1PIXMAP_1XID_FUNC);
-	rc = (jint)GDK_PIXMAP_XID((GdkPixmap *)arg0);
+	rc = (jintLong)GDK_PIXMAP_XID((GdkPixmap *)arg0);
 	OS_NATIVE_EXIT(env, that, _1GDK_1PIXMAP_1XID_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GDK_1ROOT_1PARENT
-JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1ROOT_1PARENT)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1ROOT_1PARENT)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GDK_1ROOT_1PARENT_FUNC);
-	rc = (jint)GDK_ROOT_PARENT();
+	rc = (jintLong)GDK_ROOT_PARENT();
 	OS_NATIVE_EXIT(env, that, _1GDK_1ROOT_1PARENT_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GDK_1TYPE_1COLOR
-JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1TYPE_1COLOR)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1TYPE_1COLOR)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GDK_1TYPE_1COLOR_FUNC);
-	rc = (jint)GDK_TYPE_COLOR;
+	rc = (jintLong)GDK_TYPE_COLOR;
 	OS_NATIVE_EXIT(env, that, _1GDK_1TYPE_1COLOR_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GDK_1TYPE_1PIXBUF
-JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1TYPE_1PIXBUF)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1TYPE_1PIXBUF)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GDK_1TYPE_1PIXBUF_FUNC);
-	rc = (jint)GDK_TYPE_PIXBUF;
+	rc = (jintLong)GDK_TYPE_PIXBUF;
 	OS_NATIVE_EXIT(env, that, _1GDK_1TYPE_1PIXBUF_FUNC);
 	return rc;
 }
@@ -1146,7 +1137,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1TYPE_1PIXBUF)
 
 #ifndef NO__1GTK_1IS_1BUTTON
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1BUTTON)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1BUTTON_FUNC);
@@ -1158,7 +1149,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1BUTTON)
 
 #ifndef NO__1GTK_1IS_1CELL_1RENDERER_1PIXBUF
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1PIXBUF)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1PIXBUF_FUNC);
@@ -1170,7 +1161,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1PIXBUF)
 
 #ifndef NO__1GTK_1IS_1CELL_1RENDERER_1TEXT
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TEXT)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1TEXT_FUNC);
@@ -1182,7 +1173,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TEXT)
 
 #ifndef NO__1GTK_1IS_1CELL_1RENDERER_1TOGGLE
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TOGGLE)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1TOGGLE_FUNC);
@@ -1194,7 +1185,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TOGGLE)
 
 #ifndef NO__1GTK_1IS_1CONTAINER
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CONTAINER)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CONTAINER_FUNC);
@@ -1206,7 +1197,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CONTAINER)
 
 #ifndef NO__1GTK_1IS_1IMAGE_1MENU_1ITEM
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1IMAGE_1MENU_1ITEM)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1IMAGE_1MENU_1ITEM_FUNC);
@@ -1218,7 +1209,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1IMAGE_1MENU_1ITEM)
 
 #ifndef NO__1GTK_1IS_1MENU_1ITEM
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1MENU_1ITEM)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1MENU_1ITEM_FUNC);
@@ -1230,7 +1221,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1MENU_1ITEM)
 
 #ifndef NO__1GTK_1IS_1PLUG
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1PLUG)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1PLUG_FUNC);
@@ -1242,7 +1233,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1PLUG)
 
 #ifndef NO__1GTK_1IS_1SOCKET
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1SOCKET)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1SOCKET_FUNC);
@@ -1254,7 +1245,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1SOCKET)
 
 #ifndef NO__1GTK_1IS_1WINDOW
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1WINDOW)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1WINDOW_FUNC);
@@ -1265,96 +1256,96 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1WINDOW)
 #endif
 
 #ifndef NO__1GTK_1STOCK_1CANCEL
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1STOCK_1CANCEL)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1STOCK_1CANCEL)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1STOCK_1CANCEL_FUNC);
-	rc = (jint)GTK_STOCK_CANCEL;
+	rc = (jintLong)GTK_STOCK_CANCEL;
 	OS_NATIVE_EXIT(env, that, _1GTK_1STOCK_1CANCEL_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1STOCK_1OK
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1STOCK_1OK)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1STOCK_1OK)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1STOCK_1OK_FUNC);
-	rc = (jint)GTK_STOCK_OK;
+	rc = (jintLong)GTK_STOCK_OK;
 	OS_NATIVE_EXIT(env, that, _1GTK_1STOCK_1OK_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF_FUNC);
-	rc = (jint)GTK_TYPE_CELL_RENDERER_PIXBUF;
+	rc = (jintLong)GTK_TYPE_CELL_RENDERER_PIXBUF;
 	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1TEXT
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TEXT)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TEXT)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TEXT_FUNC);
-	rc = (jint)GTK_TYPE_CELL_RENDERER_TEXT;
+	rc = (jintLong)GTK_TYPE_CELL_RENDERER_TEXT;
 	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TEXT_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE_FUNC);
-	rc = (jint)GTK_TYPE_CELL_RENDERER_TOGGLE;
+	rc = (jintLong)GTK_TYPE_CELL_RENDERER_TOGGLE;
 	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1FIXED
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1FIXED)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1FIXED)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1FIXED_FUNC);
-	rc = (jint)GTK_TYPE_FIXED;
+	rc = (jintLong)GTK_TYPE_FIXED;
 	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1FIXED_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1MENU
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1MENU)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1MENU)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1MENU_FUNC);
-	rc = (jint)GTK_TYPE_MENU;
+	rc = (jintLong)GTK_TYPE_MENU;
 	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1MENU_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1WIDGET
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1WIDGET)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1WIDGET)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1WIDGET_FUNC);
-	rc = (jint)GTK_TYPE_WIDGET;
+	rc = (jintLong)GTK_TYPE_WIDGET;
 	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1WIDGET_FUNC);
 	return rc;
 }
@@ -1362,7 +1353,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1WIDGET)
 
 #ifndef NO__1GTK_1WIDGET_1FLAGS
 JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1WIDGET_1FLAGS)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1FLAGS_FUNC);
@@ -1374,7 +1365,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1WIDGET_1FLAGS)
 
 #ifndef NO__1GTK_1WIDGET_1HAS_1DEFAULT
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1HAS_1DEFAULT)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1HAS_1DEFAULT_FUNC);
@@ -1386,7 +1377,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1HAS_1DEFAULT)
 
 #ifndef NO__1GTK_1WIDGET_1HAS_1FOCUS
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1HAS_1FOCUS)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1HAS_1FOCUS_FUNC);
@@ -1398,7 +1389,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1HAS_1FOCUS)
 
 #ifndef NO__1GTK_1WIDGET_1IS_1SENSITIVE
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1IS_1SENSITIVE)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1IS_1SENSITIVE_FUNC);
@@ -1410,7 +1401,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1IS_1SENSITIVE)
 
 #ifndef NO__1GTK_1WIDGET_1MAPPED
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1MAPPED)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1MAPPED_FUNC);
@@ -1422,7 +1413,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1MAPPED)
 
 #ifndef NO__1GTK_1WIDGET_1SENSITIVE
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1SENSITIVE)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1SENSITIVE_FUNC);
@@ -1434,7 +1425,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1SENSITIVE)
 
 #ifndef NO__1GTK_1WIDGET_1SET_1FLAGS
 JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1SET_1FLAGS)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1SET_1FLAGS_FUNC);
 	GTK_WIDGET_SET_FLAGS(arg0, arg1);
@@ -1444,7 +1435,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1SET_1FLAGS)
 
 #ifndef NO__1GTK_1WIDGET_1STATE
 JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1WIDGET_1STATE)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1STATE_FUNC);
@@ -1456,7 +1447,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1WIDGET_1STATE)
 
 #ifndef NO__1GTK_1WIDGET_1UNSET_1FLAGS
 JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1UNSET_1FLAGS)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1UNSET_1FLAGS_FUNC);
 	GTK_WIDGET_UNSET_FLAGS(arg0, arg1);
@@ -1466,7 +1457,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1UNSET_1FLAGS)
 
 #ifndef NO__1GTK_1WIDGET_1VISIBLE
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1VISIBLE)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1VISIBLE_FUNC);
@@ -1477,84 +1468,84 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1VISIBLE)
 #endif
 
 #ifndef NO__1G_1OBJECT_1CLASS
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1OBJECT_1CLASS)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1CLASS)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1CLASS_FUNC);
-	rc = (jint)G_OBJECT_CLASS(arg0);
+	rc = (jintLong)G_OBJECT_CLASS(arg0);
 	OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1CLASS_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1G_1OBJECT_1GET_1CLASS
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1OBJECT_1GET_1CLASS)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1GET_1CLASS)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1GET_1CLASS_FUNC);
-	rc = (jint)G_OBJECT_GET_CLASS(arg0);
+	rc = (jintLong)G_OBJECT_GET_CLASS(arg0);
 	OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1GET_1CLASS_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1G_1OBJECT_1TYPE
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1TYPE_FUNC);
-	rc = (jint)G_OBJECT_TYPE(arg0);
+	rc = (jintLong)G_OBJECT_TYPE(arg0);
 	OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1TYPE_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1G_1OBJECT_1TYPE_1NAME
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1TYPE_1NAME_FUNC);
-	rc = (jint)G_OBJECT_TYPE_NAME(arg0);
+	rc = (jintLong)G_OBJECT_TYPE_NAME(arg0);
 	OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1TYPE_1NAME_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1G_1TYPE_1BOOLEAN
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1TYPE_1BOOLEAN)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1BOOLEAN)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1G_1TYPE_1BOOLEAN_FUNC);
-	rc = (jint)G_TYPE_BOOLEAN;
+	rc = (jintLong)G_TYPE_BOOLEAN;
 	OS_NATIVE_EXIT(env, that, _1G_1TYPE_1BOOLEAN_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1G_1TYPE_1INT
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1TYPE_1INT)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1INT)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1G_1TYPE_1INT_FUNC);
-	rc = (jint)G_TYPE_INT;
+	rc = (jintLong)G_TYPE_INT;
 	OS_NATIVE_EXIT(env, that, _1G_1TYPE_1INT_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1G_1TYPE_1STRING
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1TYPE_1STRING)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1STRING)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1G_1TYPE_1STRING_FUNC);
-	rc = (jint)G_TYPE_STRING;
+	rc = (jintLong)G_TYPE_STRING;
 	OS_NATIVE_EXIT(env, that, _1G_1TYPE_1STRING_FUNC);
 	return rc;
 }
@@ -1573,12 +1564,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1PANGO_1PIXELS)
 #endif
 
 #ifndef NO__1PANGO_1TYPE_1FONT_1DESCRIPTION
-JNIEXPORT jint JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1DESCRIPTION)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1DESCRIPTION)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC);
-	rc = (jint)PANGO_TYPE_FONT_DESCRIPTION;
+	rc = (jintLong)PANGO_TYPE_FONT_DESCRIPTION;
 	OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC);
 	return rc;
 }
@@ -1586,7 +1577,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1DESCRIPTION)
 
 #ifndef NO__1XCheckIfEvent
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckIfEvent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XCheckIfEvent_FUNC);
@@ -1598,7 +1589,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckIfEvent)
 
 #ifndef NO__1XCheckMaskEvent
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckMaskEvent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XCheckMaskEvent_FUNC);
@@ -1610,7 +1601,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckMaskEvent)
 
 #ifndef NO__1XCheckWindowEvent
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckWindowEvent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XCheckWindowEvent_FUNC);
@@ -1621,12 +1612,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckWindowEvent)
 #endif
 
 #ifndef NO__1XDefaultRootWindow
-JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultRootWindow)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XDefaultRootWindow)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XDefaultRootWindow_FUNC);
-	rc = (jint)XDefaultRootWindow((Display *)arg0);
+	rc = (jintLong)XDefaultRootWindow((Display *)arg0);
 	OS_NATIVE_EXIT(env, that, _1XDefaultRootWindow_FUNC);
 	return rc;
 }
@@ -1634,7 +1625,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultRootWindow)
 
 #ifndef NO__1XDefaultScreen
 JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultScreen)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XDefaultScreen_FUNC);
@@ -1646,7 +1637,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultScreen)
 
 #ifndef NO__1XFlush
 JNIEXPORT void JNICALL OS_NATIVE(_1XFlush)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1XFlush_FUNC);
 	XFlush((Display *)arg0);
@@ -1656,7 +1647,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XFlush)
 
 #ifndef NO__1XFree
 JNIEXPORT void JNICALL OS_NATIVE(_1XFree)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1XFree_FUNC);
 	XFree((void *)arg0);
@@ -1665,26 +1656,26 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XFree)
 #endif
 
 #ifndef NO__1XGetSelectionOwner
-JNIEXPORT jint JNICALL OS_NATIVE(_1XGetSelectionOwner)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XGetSelectionOwner)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XGetSelectionOwner_FUNC);
-	rc = (jint)XGetSelectionOwner((Display *)arg0, (Atom)arg1);
+	rc = (jintLong)XGetSelectionOwner((Display *)arg0, (Atom)arg1);
 	OS_NATIVE_EXIT(env, that, _1XGetSelectionOwner_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1XInternAtom
-JNIEXPORT jint JNICALL OS_NATIVE(_1XInternAtom)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jboolean arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XInternAtom)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2)
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XInternAtom_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)XInternAtom((Display *)arg0, (char *)lparg1, (Bool)arg2);
+	rc = (jintLong)XInternAtom((Display *)arg0, (char *)lparg1, (Bool)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1XInternAtom_FUNC);
@@ -1694,7 +1685,7 @@ fail:
 
 #ifndef NO__1XKeysymToKeycode
 JNIEXPORT jint JNICALL OS_NATIVE(_1XKeysymToKeycode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XKeysymToKeycode_FUNC);
@@ -1705,14 +1696,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XKeysymToKeycode)
 #endif
 
 #ifndef NO__1XListProperties
-JNIEXPORT jint JNICALL OS_NATIVE(_1XListProperties)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XListProperties)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XListProperties_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)XListProperties((Display *)arg0, (Window)arg1, (int *)lparg2);
+	rc = (jintLong)XListProperties((Display *)arg0, (Window)arg1, (int *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1XListProperties_FUNC);
@@ -1722,10 +1713,10 @@ fail:
 
 #ifndef NO__1XQueryPointer
 JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryPointer)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8)
 {
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint *lparg6=NULL;
@@ -1733,8 +1724,8 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryPointer)
 	jint *lparg8=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XQueryPointer_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
@@ -1747,8 +1738,8 @@ fail:
 	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1XQueryPointer_FUNC);
 	return rc;
 }
@@ -1756,24 +1747,24 @@ fail:
 
 #ifndef NO__1XQueryTree
 JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryTree)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5)
 {
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XQueryTree_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	rc = (jint)XQueryTree((Display *)arg0, (Window)arg1, (Window *)lparg2, (Window *)lparg3, (Window **)lparg4, (unsigned int *)lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1XQueryTree_FUNC);
 	return rc;
 }
@@ -1781,7 +1772,7 @@ fail:
 
 #ifndef NO__1XReconfigureWMWindow
 JNIEXPORT jint JNICALL OS_NATIVE(_1XReconfigureWMWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4)
 {
 	XWindowChanges _arg4, *lparg4=NULL;
 	jint rc = 0;
@@ -1796,24 +1787,16 @@ fail:
 
 #ifndef NO__1XRenderComposite
 JNIEXPORT void JNICALL OS_NATIVE(_1XRenderComposite)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
 {
 	OS_NATIVE_ENTER(env, that, _1XRenderComposite_FUNC);
 /*
 	XRenderComposite(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderComposite_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderComposite");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
+		LOAD_FUNCTION(fp, XRenderComposite)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong, jintLong, jint, jint, jint, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1XRenderComposite_FUNC);
@@ -1821,29 +1804,20 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderComposite)
 #endif
 
 #ifndef NO__1XRenderCreatePicture
-JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderCreatePicture)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderCreatePicture)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4)
 {
 	XRenderPictureAttributes _arg4, *lparg4=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XRenderCreatePicture_FUNC);
 	if (arg4) if ((lparg4 = getXRenderPictureAttributesFields(env, arg4, &_arg4)) == NULL) goto fail;
 /*
-	rc = (jint)XRenderCreatePicture(arg0, arg1, arg2, arg3, lparg4);
+	rc = (jintLong)XRenderCreatePicture(arg0, arg1, arg2, arg3, lparg4);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, jint, jint, jint, XRenderPictureAttributes *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderCreatePicture_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderCreatePicture");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, arg2, arg3, lparg4);
+		LOAD_FUNCTION(fp, XRenderCreatePicture)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, XRenderPictureAttributes *))fp)(arg0, arg1, arg2, arg3, lparg4);
 		}
 	}
 fail:
@@ -1853,27 +1827,18 @@ fail:
 #endif
 
 #ifndef NO__1XRenderFindStandardFormat
-JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindStandardFormat)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindStandardFormat)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XRenderFindStandardFormat_FUNC);
 /*
-	rc = (jint)XRenderFindStandardFormat(arg0, arg1);
+	rc = (jintLong)XRenderFindStandardFormat(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderFindStandardFormat_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderFindStandardFormat");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, XRenderFindStandardFormat)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1XRenderFindStandardFormat_FUNC);
@@ -1882,27 +1847,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindStandardFormat)
 #endif
 
 #ifndef NO__1XRenderFindVisualFormat
-JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindVisualFormat)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindVisualFormat)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XRenderFindVisualFormat_FUNC);
 /*
-	rc = (jint)XRenderFindVisualFormat(arg0, arg1);
+	rc = (jintLong)XRenderFindVisualFormat(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderFindVisualFormat_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderFindVisualFormat");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, XRenderFindVisualFormat)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1XRenderFindVisualFormat_FUNC);
@@ -1912,24 +1868,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindVisualFormat)
 
 #ifndef NO__1XRenderFreePicture
 JNIEXPORT void JNICALL OS_NATIVE(_1XRenderFreePicture)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1XRenderFreePicture_FUNC);
 /*
 	XRenderFreePicture(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderFreePicture_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderFreePicture");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, XRenderFreePicture)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1XRenderFreePicture_FUNC);
@@ -1938,7 +1886,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderFreePicture)
 
 #ifndef NO__1XRenderQueryExtension
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1XRenderQueryExtension)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -1950,18 +1898,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XRenderQueryExtension)
 	rc = (jboolean)XRenderQueryExtension(arg0, lparg1, lparg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(jint, jint *, jint *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderQueryExtension_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderQueryExtension");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)(arg0, lparg1, lparg2);
+		LOAD_FUNCTION(fp, XRenderQueryExtension)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2);
 		}
 	}
 fail:
@@ -1974,7 +1913,7 @@ fail:
 
 #ifndef NO__1XRenderQueryVersion
 JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderQueryVersion)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -1986,18 +1925,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderQueryVersion)
 	rc = (jint)XRenderQueryVersion(arg0, lparg1, lparg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, jint *, jint *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderQueryVersion_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderQueryVersion");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, lparg1, lparg2);
+		LOAD_FUNCTION(fp, XRenderQueryVersion)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2);
 		}
 	}
 fail:
@@ -2010,7 +1940,7 @@ fail:
 
 #ifndef NO__1XRenderSetPictureClipRectangles
 JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRectangles)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jshortArray arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jshortArray arg4, jint arg5)
 {
 	jshort *lparg4=NULL;
 	OS_NATIVE_ENTER(env, that, _1XRenderSetPictureClipRectangles_FUNC);
@@ -2019,17 +1949,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRectangles)
 	XRenderSetPictureClipRectangles(arg0, arg1, arg2, arg3, lparg4, arg5);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint, jint, jint, jshort *, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderSetPictureClipRectangles_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderSetPictureClipRectangles");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2, arg3, lparg4, arg5);
+		LOAD_FUNCTION(fp, XRenderSetPictureClipRectangles)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jshort *, jint))fp)(arg0, arg1, arg2, arg3, lparg4, arg5);
 		}
 	}
 fail:
@@ -2040,7 +1962,7 @@ fail:
 
 #ifndef NO__1XRenderSetPictureTransform
 JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureTransform)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1XRenderSetPictureTransform_FUNC);
@@ -2049,17 +1971,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureTransform)
 	XRenderSetPictureTransform(arg0, arg1, lparg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint, jint *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderSetPictureTransform_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderSetPictureTransform");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, lparg2);
+		LOAD_FUNCTION(fp, XRenderSetPictureTransform)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jint *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
@@ -2070,7 +1984,7 @@ fail:
 
 #ifndef NO__1XSendEvent
 JNIEXPORT jint JNICALL OS_NATIVE(_1XSendEvent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jintLong arg3, jintLong arg4)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XSendEvent_FUNC);
@@ -2081,24 +1995,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XSendEvent)
 #endif
 
 #ifndef NO__1XSetErrorHandler
-JNIEXPORT jint JNICALL OS_NATIVE(_1XSetErrorHandler)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetErrorHandler)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XSetErrorHandler_FUNC);
-	rc = (jint)XSetErrorHandler((XErrorHandler)arg0);
+	rc = (jintLong)XSetErrorHandler((XErrorHandler)arg0);
 	OS_NATIVE_EXIT(env, that, _1XSetErrorHandler_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1XSetIOErrorHandler
-JNIEXPORT jint JNICALL OS_NATIVE(_1XSetIOErrorHandler)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetIOErrorHandler)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XSetIOErrorHandler_FUNC);
-	rc = (jint)XSetIOErrorHandler((XIOErrorHandler)arg0);
+	rc = (jintLong)XSetIOErrorHandler((XIOErrorHandler)arg0);
 	OS_NATIVE_EXIT(env, that, _1XSetIOErrorHandler_FUNC);
 	return rc;
 }
@@ -2106,7 +2020,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XSetIOErrorHandler)
 
 #ifndef NO__1XSetInputFocus
 JNIEXPORT jint JNICALL OS_NATIVE(_1XSetInputFocus)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XSetInputFocus_FUNC);
@@ -2118,7 +2032,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XSetInputFocus)
 
 #ifndef NO__1XSetTransientForHint
 JNIEXPORT jint JNICALL OS_NATIVE(_1XSetTransientForHint)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XSetTransientForHint_FUNC);
@@ -2129,12 +2043,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XSetTransientForHint)
 #endif
 
 #ifndef NO__1XSynchronize
-JNIEXPORT jint JNICALL OS_NATIVE(_1XSynchronize)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSynchronize)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XSynchronize_FUNC);
-	rc = (jint)XSynchronize((Display *)arg0, arg1);
+	rc = (jintLong)XSynchronize((Display *)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, _1XSynchronize_FUNC);
 	return rc;
 }
@@ -2142,7 +2056,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XSynchronize)
 
 #ifndef NO__1XTestFakeButtonEvent
 JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeButtonEvent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jintLong arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1XTestFakeButtonEvent_FUNC);
 	XTestFakeButtonEvent((Display *)arg0, arg1, (Bool)arg2, (unsigned long)arg3);
@@ -2152,7 +2066,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeButtonEvent)
 
 #ifndef NO__1XTestFakeKeyEvent
 JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeKeyEvent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jintLong arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1XTestFakeKeyEvent_FUNC);
 	XTestFakeKeyEvent((Display *)arg0, arg1, (Bool)arg2, (unsigned long)arg3);
@@ -2162,7 +2076,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeKeyEvent)
 
 #ifndef NO__1XTestFakeMotionEvent
 JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeMotionEvent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4)
 {
 	OS_NATIVE_ENTER(env, that, _1XTestFakeMotionEvent_FUNC);
 	XTestFakeMotionEvent((Display *)arg0, arg1, arg2, arg3, (unsigned long)arg4);
@@ -2172,7 +2086,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeMotionEvent)
 
 #ifndef NO__1XWarpPointer
 JNIEXPORT jint JNICALL OS_NATIVE(_1XWarpPointer)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XWarpPointer_FUNC);
@@ -2184,7 +2098,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XWarpPointer)
 
 #ifndef NO__1atk_1object_1add_1relationship
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1add_1relationship)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1atk_1object_1add_1relationship_FUNC);
@@ -2192,18 +2106,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1add_1relationship)
 	rc = (jboolean)atk_object_add_relationship((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(AtkObject *, AtkRelationType, AtkObject *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(atk_object_add_relationship_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "atk_object_add_relationship");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2);
+		LOAD_FUNCTION(fp, atk_object_add_relationship)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(AtkObject *, AtkRelationType, AtkObject *))fp)((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1atk_1object_1add_1relationship_FUNC);
@@ -2212,12 +2117,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1add_1relationship)
 #endif
 
 #ifndef NO__1call
-JNIEXPORT jint JNICALL OS_NATIVE(_1call)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1call)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1call_FUNC);
-	rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 	OS_NATIVE_EXIT(env, that, _1call_FUNC);
 	return rc;
 }
@@ -2225,7 +2130,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1call)
 
 #ifndef NO__1dlclose
 JNIEXPORT jint JNICALL OS_NATIVE(_1dlclose)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1dlclose_FUNC);
@@ -2236,14 +2141,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1dlclose)
 #endif
 
 #ifndef NO__1dlopen
-JNIEXPORT jint JNICALL OS_NATIVE(_1dlopen)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1dlopen)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1dlopen_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)dlopen((const char *)lparg0, arg1);
+	rc = (jintLong)dlopen((const char *)lparg0, arg1);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1dlopen_FUNC);
@@ -2252,14 +2157,14 @@ fail:
 #endif
 
 #ifndef NO__1dlsym
-JNIEXPORT jint JNICALL OS_NATIVE(_1dlsym)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1dlsym)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1dlsym_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)dlsym((void *)arg0, (const char *)lparg1);
+	rc = (jintLong)dlsym((void *)arg0, (const char *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1dlsym_FUNC);
@@ -2268,24 +2173,24 @@ fail:
 #endif
 
 #ifndef NO__1g_1cclosure_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1cclosure_1new)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1cclosure_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1cclosure_1new_FUNC);
-	rc = (jint)g_cclosure_new((GCallback)arg0, (gpointer)arg1, (GClosureNotify)arg2);
+	rc = (jintLong)g_cclosure_new((GCallback)arg0, (gpointer)arg1, (GClosureNotify)arg2);
 	OS_NATIVE_EXIT(env, that, _1g_1cclosure_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1closure_1ref
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1closure_1ref)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1closure_1ref)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1closure_1ref_FUNC);
-	rc = (jint)g_closure_ref((GClosure *)arg0);
+	rc = (jintLong)g_closure_ref((GClosure *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1closure_1ref_FUNC);
 	return rc;
 }
@@ -2293,7 +2198,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1closure_1ref)
 
 #ifndef NO__1g_1closure_1unref
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1unref)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1closure_1unref_FUNC);
 	g_closure_unref((GClosure *)arg0);
@@ -2302,79 +2207,79 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1unref)
 #endif
 
 #ifndef NO__1g_1filename_1from_1uri
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1filename_1from_1uri)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1from_1uri)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2)
 {
-	jint *lparg1=NULL;
-	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong *lparg1=NULL;
+	jintLong *lparg2=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1uri_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)g_filename_from_uri((const char *)arg0, (char **)lparg1, (GError **)lparg2);
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_filename_from_uri((const char *)arg0, (char **)lparg1, (GError **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1filename_1from_1uri_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1filename_1from_1utf8
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1filename_1from_1utf8)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1from_1utf8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
 {
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1utf8_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)g_filename_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_filename_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1filename_1from_1utf8_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1filename_1to_1uri
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1filename_1to_1uri)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1to_1uri)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong *lparg2=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1uri_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)g_filename_to_uri((const char *)arg0, (const char *)arg1, (GError **)lparg2);
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_filename_to_uri((const char *)arg0, (const char *)arg1, (GError **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1filename_1to_1uri_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1filename_1to_1utf8
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1filename_1to_1utf8)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1to_1utf8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
 {
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1utf8_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)g_filename_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_filename_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1filename_1to_1utf8_FUNC);
 	return rc;
 }
@@ -2382,7 +2287,7 @@ fail:
 
 #ifndef NO__1g_1free
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1free_FUNC);
 	g_free((gpointer)arg0);
@@ -2392,7 +2297,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1free)
 
 #ifndef NO__1g_1idle_1add
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1idle_1add)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1idle_1add_FUNC);
@@ -2403,24 +2308,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1idle_1add)
 #endif
 
 #ifndef NO__1g_1list_1append
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1append)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1append)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1list_1append_FUNC);
-	rc = (jint)g_list_append((GList *)arg0, (gpointer)arg1);
+	rc = (jintLong)g_list_append((GList *)arg0, (gpointer)arg1);
 	OS_NATIVE_EXIT(env, that, _1g_1list_1append_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1list_1data
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1data)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1data)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1list_1data_FUNC);
-	rc = (jint)g_list_data((GList *)arg0);
+	rc = (jintLong)g_list_data((GList *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1list_1data_FUNC);
 	return rc;
 }
@@ -2428,7 +2333,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1data)
 
 #ifndef NO__1g_1list_1free
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1list_1free_FUNC);
 	g_list_free((GList *)arg0);
@@ -2438,7 +2343,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free)
 
 #ifndef NO__1g_1list_1free_11
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free_11)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1list_1free_11_FUNC);
 	g_list_free_1((GList *)arg0);
@@ -2448,7 +2353,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free_11)
 
 #ifndef NO__1g_1list_1length
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1length)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1list_1length_FUNC);
@@ -2459,84 +2364,84 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1length)
 #endif
 
 #ifndef NO__1g_1list_1next
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1next)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1next)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1list_1next_FUNC);
-	rc = (jint)g_list_next(arg0);
+	rc = (jintLong)g_list_next(arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1list_1next_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1list_1nth
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1nth)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1nth)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1list_1nth_FUNC);
-	rc = (jint)g_list_nth((GList *)arg0, (guint)arg1);
+	rc = (jintLong)g_list_nth((GList *)arg0, (guint)arg1);
 	OS_NATIVE_EXIT(env, that, _1g_1list_1nth_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1list_1nth_1data
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1nth_1data)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1nth_1data)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1list_1nth_1data_FUNC);
-	rc = (jint)g_list_nth_data((GList *)arg0, (guint)arg1);
+	rc = (jintLong)g_list_nth_data((GList *)arg0, (guint)arg1);
 	OS_NATIVE_EXIT(env, that, _1g_1list_1nth_1data_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1list_1prepend
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1prepend)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1prepend)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1list_1prepend_FUNC);
-	rc = (jint)g_list_prepend((GList *)arg0, (gpointer)arg1);
+	rc = (jintLong)g_list_prepend((GList *)arg0, (gpointer)arg1);
 	OS_NATIVE_EXIT(env, that, _1g_1list_1prepend_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1list_1previous
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1previous)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1previous)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1list_1previous_FUNC);
-	rc = (jint)g_list_previous(arg0);
+	rc = (jintLong)g_list_previous(arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1list_1previous_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1list_1remove_1link
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1remove_1link)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1remove_1link)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1list_1remove_1link_FUNC);
-	rc = (jint)g_list_remove_link((GList *)arg0, (GList *)arg1);
+	rc = (jintLong)g_list_remove_link((GList *)arg0, (GList *)arg1);
 	OS_NATIVE_EXIT(env, that, _1g_1list_1remove_1link_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1list_1reverse
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1reverse)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1reverse)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1list_1reverse_FUNC);
-	rc = (jint)g_list_reverse((GList *)arg0);
+	rc = (jintLong)g_list_reverse((GList *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1list_1reverse_FUNC);
 	return rc;
 }
@@ -2544,7 +2449,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1reverse)
 
 #ifndef NO__1g_1list_1set_1next
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1next)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1list_1set_1next_FUNC);
 	g_list_set_next((GList *)arg0, (GList *)arg1);
@@ -2554,7 +2459,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1next)
 
 #ifndef NO__1g_1list_1set_1previous
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1previous)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1list_1set_1previous_FUNC);
 	g_list_set_previous((GList *)arg0, (GList *)arg1);
@@ -2563,44 +2468,44 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1previous)
 #endif
 
 #ifndef NO__1g_1locale_1from_1utf8
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1locale_1from_1utf8)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1locale_1from_1utf8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
 {
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1locale_1from_1utf8_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)g_locale_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_locale_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1locale_1from_1utf8_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1locale_1to_1utf8
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1locale_1to_1utf8)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1locale_1to_1utf8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
 {
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1locale_1to_1utf8_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)g_locale_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_locale_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1locale_1to_1utf8_FUNC);
 	return rc;
 }
@@ -2608,7 +2513,7 @@ fail:
 
 #ifndef NO__1g_1log_1default_1handler
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1log_1default_1handler)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1log_1default_1handler_FUNC);
 	g_log_default_handler((gchar *)arg0, (GLogLevelFlags)arg1, (gchar *)arg2, (gpointer)arg3);
@@ -2632,7 +2537,7 @@ fail:
 
 #ifndef NO__1g_1log_1set_1handler
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1log_1set_1handler)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jbyte *lparg0=NULL;
 	jint rc = 0;
@@ -2648,7 +2553,7 @@ fail:
 
 #ifndef NO__1g_1main_1context_1acquire
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1acquire)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1acquire_FUNC);
@@ -2660,7 +2565,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1acquire)
 
 #ifndef NO__1g_1main_1context_1check
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1check)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1check_FUNC);
@@ -2671,24 +2576,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1check)
 #endif
 
 #ifndef NO__1g_1main_1context_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1main_1context_1default)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1default_FUNC);
-	rc = (jint)g_main_context_default();
+	rc = (jintLong)g_main_context_default();
 	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1default_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1main_1context_1get_1poll_1func
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1get_1poll_1func_FUNC);
-	rc = (jint)g_main_context_get_poll_func((GMainContext *)arg0);
+	rc = (jintLong)g_main_context_get_poll_func((GMainContext *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1get_1poll_1func_FUNC);
 	return rc;
 }
@@ -2696,7 +2601,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func)
 
 #ifndef NO__1g_1main_1context_1iteration
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1iteration)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1iteration_FUNC);
@@ -2708,7 +2613,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1iteration)
 
 #ifndef NO__1g_1main_1context_1pending
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1pending)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1pending_FUNC);
@@ -2720,7 +2625,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1pending)
 
 #ifndef NO__1g_1main_1context_1prepare
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1prepare)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
 {
 	jint *lparg1=NULL;
 	jboolean rc = 0;
@@ -2736,7 +2641,7 @@ fail:
 
 #ifndef NO__1g_1main_1context_1query
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1query)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintLong arg3, jint arg4)
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
@@ -2752,7 +2657,7 @@ fail:
 
 #ifndef NO__1g_1main_1context_1release
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1main_1context_1release)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1release_FUNC);
 	g_main_context_release((GMainContext *)arg0);
@@ -2761,12 +2666,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1main_1context_1release)
 #endif
 
 #ifndef NO__1g_1malloc
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1malloc)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1malloc)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1malloc_FUNC);
-	rc = (jint)g_malloc((gulong)arg0);
+	rc = (jintLong)g_malloc((gulong)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1malloc_FUNC);
 	return rc;
 }
@@ -2774,7 +2679,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1malloc)
 
 #ifndef NO__1g_1object_1get
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jintArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
 {
 	jbyte *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -2790,117 +2695,172 @@ fail:
 #endif
 
 #ifndef NO__1g_1object_1get_1qdata
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1object_1get_1qdata)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1get_1qdata)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1object_1get_1qdata_FUNC);
-	rc = (jint)g_object_get_qdata((GObject *)arg0, (GQuark)arg1);
+	rc = (jintLong)g_object_get_qdata((GObject *)arg0, (GQuark)arg1);
 	OS_NATIVE_EXIT(env, that, _1g_1object_1get_1qdata_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1object_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1object_1new)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1object_1new_FUNC);
-	rc = (jint)g_object_new((GType)arg0, (const gchar *)arg1);
+	rc = (jintLong)g_object_new((GType)arg0, (const gchar *)arg1);
 	OS_NATIVE_EXIT(env, that, _1g_1object_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1object_1ref
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1object_1ref)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1ref)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1object_1ref_FUNC);
-	rc = (jint)g_object_ref((gpointer)arg0);
+	rc = (jintLong)g_object_ref((gpointer)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1object_1ref_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO__1g_1object_1set__I_3BFI
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BFI)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jfloat arg2, jint arg3)
+#if (!defined(NO__1g_1object_1set__I_3BFI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BFJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BFI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jfloat arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BFJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jfloat arg2, jintLong arg3)
+#endif
 {
 	jbyte *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BFI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BFJ_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BFI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BFJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1g_1object_1set__I_3BII
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BII)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+#if (!defined(NO__1g_1object_1set__I_3BII) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BIJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLong arg3)
+#endif
 {
 	jbyte *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BIJ_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BIJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1g_1object_1set__I_3BJI
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BJI)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jlong arg2, jint arg3)
+#if (!defined(NO__1g_1object_1set__I_3BJI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BJI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlong arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BJJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlong arg2, jintLong arg3)
+#endif
 {
 	jbyte *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BJI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BJJ_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BJI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2, jint arg3)
+#if (!defined(NO__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3)
+#endif
 {
 	jbyte *lparg1=NULL;
 	GdkColor _arg2, *lparg2=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
 	g_object_set((gpointer)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
 fail:
 	if (arg2 && lparg2) setGdkColorFields(env, arg2, lparg2);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1g_1object_1set__I_3BZI
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BZI)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jboolean arg2, jint arg3)
+#if (!defined(NO__1g_1object_1set__I_3BZI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BZJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BZI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BZJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2, jintLong arg3)
+#endif
 {
 	jbyte *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BZI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BZJ_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BZI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BZJ_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO__1g_1object_1set_1qdata
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set_1qdata)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1object_1set_1qdata_FUNC);
 	g_object_set_qdata((GObject *)arg0, (GQuark)arg1, (gpointer)arg2);
@@ -2910,7 +2870,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set_1qdata)
 
 #ifndef NO__1g_1object_1unref
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1unref)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1object_1unref_FUNC);
 	g_object_unref((gpointer)arg0);
@@ -2949,12 +2909,12 @@ fail:
 #endif
 
 #ifndef NO__1g_1signal_1add_1emission_1hook
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jintLong arg3, jintLong arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1signal_1add_1emission_1hook_FUNC);
-	rc = (jint)g_signal_add_emission_hook((guint)arg0, (GQuark)arg1, (GSignalEmissionHook)arg2, (gpointer)arg3, (GDestroyNotify)arg4);
+	rc = (jintLong)g_signal_add_emission_hook((guint)arg0, (GQuark)arg1, (GSignalEmissionHook)arg2, (gpointer)arg3, (GDestroyNotify)arg4);
 	OS_NATIVE_EXIT(env, that, _1g_1signal_1add_1emission_1hook_FUNC);
 	return rc;
 }
@@ -2962,7 +2922,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook)
 
 #ifndef NO__1g_1signal_1connect
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -2978,7 +2938,7 @@ fail:
 
 #ifndef NO__1g_1signal_1connect_1after
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1after)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -2994,7 +2954,7 @@ fail:
 
 #ifndef NO__1g_1signal_1connect_1closure
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jboolean arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jboolean arg3)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -3010,7 +2970,7 @@ fail:
 
 #ifndef NO__1g_1signal_1connect_1closure_1by_1id
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure_1by_1id)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jboolean arg4)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1signal_1connect_1closure_1by_1id_FUNC);
@@ -3020,68 +2980,112 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure_1by_1id)
 }
 #endif
 
-#ifndef NO__1g_1signal_1emit_1by_1name__I_3B
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3B) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#endif
 {
 	jbyte *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3B_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3B_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3B_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3B_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1g_1signal_1emit_1by_1name__I_3BI
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BI) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
+#endif
 {
 	jbyte *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BJ_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1g_1signal_1emit_1by_1name__I_3BII
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BII)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BII) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
+#endif
 {
 	jbyte *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, arg2, arg3);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1g_1signal_1emit_1by_1name__I_3B_3B
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B_3B)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3B_3B) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3B_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
+#endif
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO__1g_1signal_1handler_1disconnect
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1handler_1disconnect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1signal_1handler_1disconnect_FUNC);
 	g_signal_handler_disconnect((gpointer)arg0, (gulong)arg1);
@@ -3091,7 +3095,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1handler_1disconnect)
 
 #ifndef NO__1g_1signal_1handlers_1block_1matched
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1block_1matched)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1block_1matched_FUNC);
@@ -3103,7 +3107,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1block_1matched)
 
 #ifndef NO__1g_1signal_1handlers_1disconnect_1matched
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1disconnect_1matched)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1disconnect_1matched_FUNC);
@@ -3115,7 +3119,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1disconnect_1matched)
 
 #ifndef NO__1g_1signal_1handlers_1unblock_1matched
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1unblock_1matched)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1unblock_1matched_FUNC);
@@ -3127,7 +3131,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1unblock_1matched)
 
 #ifndef NO__1g_1signal_1lookup
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1lookup)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
 {
 	jbyte *lparg0=NULL;
 	jint rc = 0;
@@ -3143,7 +3147,7 @@ fail:
 
 #ifndef NO__1g_1signal_1remove_1emission_1hook
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1remove_1emission_1hook)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1signal_1remove_1emission_1hook_FUNC);
 	g_signal_remove_emission_hook((guint)arg0, (gulong)arg1);
@@ -3153,7 +3157,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1remove_1emission_1hook)
 
 #ifndef NO__1g_1signal_1stop_1emission_1by_1name
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1stop_1emission_1by_1name)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1g_1signal_1stop_1emission_1by_1name_FUNC);
@@ -3166,12 +3170,12 @@ fail:
 #endif
 
 #ifndef NO__1g_1slist_1data
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1data)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1data)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1slist_1data_FUNC);
-	rc = (jint)g_slist_data((GSList *)arg0);
+	rc = (jintLong)g_slist_data((GSList *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1slist_1data_FUNC);
 	return rc;
 }
@@ -3179,7 +3183,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1data)
 
 #ifndef NO__1g_1slist_1free
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1slist_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1slist_1free_FUNC);
 	g_slist_free((GSList *)arg0);
@@ -3189,7 +3193,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1slist_1free)
 
 #ifndef NO__1g_1slist_1length
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1length)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1slist_1length_FUNC);
@@ -3200,12 +3204,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1length)
 #endif
 
 #ifndef NO__1g_1slist_1next
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1next)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1next)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1slist_1next_FUNC);
-	rc = (jint)g_slist_next((GSList *)arg0);
+	rc = (jintLong)g_slist_next((GSList *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1slist_1next_FUNC);
 	return rc;
 }
@@ -3213,7 +3217,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1next)
 
 #ifndef NO__1g_1source_1remove
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1source_1remove)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1source_1remove_FUNC);
@@ -3225,7 +3229,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1source_1remove)
 
 #ifndef NO__1g_1strfreev
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1strfreev)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1strfreev_FUNC);
 	g_strfreev((gchar **)arg0);
@@ -3235,15 +3239,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1strfreev)
 
 #ifndef NO__1g_1strtod
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1g_1strtod)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1strtod_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jdouble)g_strtod((const gchar *)arg0, (gchar **)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1strtod_FUNC);
 	return rc;
 }
@@ -3251,7 +3255,7 @@ fail:
 
 #ifndef NO__1g_1thread_1init
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC);
 	g_thread_init((GThreadFunctions *)arg0);
@@ -3273,7 +3277,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1thread_1supported)
 
 #ifndef NO__1g_1type_1add_1interface_1static
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1add_1interface_1static)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1type_1add_1interface_1static_FUNC);
 	g_type_add_interface_static((GType)arg0, (GType)arg1, (const GInterfaceInfo *)arg2);
@@ -3282,38 +3286,38 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1add_1interface_1static)
 #endif
 
 #ifndef NO__1g_1type_1class_1peek
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1class_1peek)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1peek)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1type_1class_1peek_FUNC);
-	rc = (jint)g_type_class_peek((GType)arg0);
+	rc = (jintLong)g_type_class_peek((GType)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1type_1class_1peek_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1type_1class_1peek_1parent
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1class_1peek_1parent)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1peek_1parent)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1type_1class_1peek_1parent_FUNC);
-	rc = (jint)g_type_class_peek_parent((gpointer)arg0);
+	rc = (jintLong)g_type_class_peek_parent((gpointer)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1type_1class_1peek_1parent_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1type_1from_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1from_1name)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1from_1name)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1type_1from_1name_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)g_type_from_name((const gchar *)lparg0);
+	rc = (jintLong)g_type_from_name((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1type_1from_1name_FUNC);
@@ -3322,12 +3326,12 @@ fail:
 #endif
 
 #ifndef NO__1g_1type_1interface_1peek_1parent
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1type_1interface_1peek_1parent_FUNC);
-	rc = (jint)g_type_interface_peek_parent((gpointer)arg0);
+	rc = (jintLong)g_type_interface_peek_parent((gpointer)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1type_1interface_1peek_1parent_FUNC);
 	return rc;
 }
@@ -3335,7 +3339,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent)
 
 #ifndef NO__1g_1type_1is_1a
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1type_1is_1a)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1type_1is_1a_FUNC);
@@ -3346,24 +3350,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1type_1is_1a)
 #endif
 
 #ifndef NO__1g_1type_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1name)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1type_1name_FUNC);
-	rc = (jint)g_type_name((GType)arg0);
+	rc = (jintLong)g_type_name((GType)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1type_1name_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1type_1parent
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1parent)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1parent)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1type_1parent_FUNC);
-	rc = (jint)g_type_parent((GType)arg0);
+	rc = (jintLong)g_type_parent((GType)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1type_1parent_FUNC);
 	return rc;
 }
@@ -3371,7 +3375,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1parent)
 
 #ifndef NO__1g_1type_1query
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1query)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1g_1type_1query_FUNC);
 	g_type_query((GType)arg0, (GTypeQuery *)arg1);
@@ -3380,14 +3384,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1query)
 #endif
 
 #ifndef NO__1g_1type_1register_1static
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1register_1static)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1register_1static)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3)
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1type_1register_1static_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)g_type_register_static((GType)arg0, (const gchar *)lparg1, (const GTypeInfo *)arg2, (GTypeFlags)arg3);
+	rc = (jintLong)g_type_register_static((GType)arg0, (const gchar *)lparg1, (const GTypeInfo *)arg2, (GTypeFlags)arg3);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1type_1register_1static_FUNC);
@@ -3396,14 +3400,14 @@ fail:
 #endif
 
 #ifndef NO__1g_1utf16_1to_1utf8
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8)
+	(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
 {
 	jchar *lparg0=NULL;
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1utf16_1to_1utf8_FUNC);
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -3415,11 +3419,11 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8)
 #endif
 	{
 		if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-		if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-		if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-		if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+		if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+		if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+		if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)g_utf16_to_utf8((const gunichar2 *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
+	rc = (jintLong)g_utf16_to_utf8((const gunichar2 *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -3430,9 +3434,9 @@ fail:
 	} else
 #endif
 	{
-		if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-		if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-		if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+		if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+		if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+		if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 		if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, JNI_ABORT);
 	}
 	OS_NATIVE_EXIT(env, that, _1g_1utf16_1to_1utf8_FUNC);
@@ -3441,50 +3445,57 @@ fail:
 #endif
 
 #ifndef NO__1g_1utf8_1offset_1to_1pointer
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1offset_1to_1pointer)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1offset_1to_1pointer)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1utf8_1offset_1to_1pointer_FUNC);
-	rc = (jint)g_utf8_offset_to_pointer((const gchar *)arg0, arg1);
+	rc = (jintLong)g_utf8_offset_to_pointer((const gchar *)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, _1g_1utf8_1offset_1to_1pointer_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1utf8_1pointer_1to_1offset
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1pointer_1to_1offset)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1pointer_1to_1offset)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1utf8_1pointer_1to_1offset_FUNC);
-	rc = (jint)g_utf8_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1);
+	rc = (jintLong)g_utf8_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1);
 	OS_NATIVE_EXIT(env, that, _1g_1utf8_1pointer_1to_1offset_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1utf8_1strlen
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1strlen)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1strlen)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1utf8_1strlen_FUNC);
-	rc = (jint)g_utf8_strlen((const gchar *)arg0, arg1);
+	rc = (jintLong)g_utf8_strlen((const gchar *)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, _1g_1utf8_1strlen_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO__1g_1utf8_1to_1utf16__II_3I_3I_3I
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__II_3I_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+#if (!defined(NO__1g_1utf8_1to_1utf16__II_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16__JJ_3J_3J_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__II_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__JJ_3J_3J_3J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+#endif
 {
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
@@ -3493,11 +3504,11 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__II_3I_3I_3I)
 	} else
 #endif
 	{
-		if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-		if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-		if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+		if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+		if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+		if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)g_utf8_to_utf16((const gchar *)arg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
+	rc = (jintLong)g_utf8_to_utf16((const gchar *)arg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -3507,25 +3518,36 @@ fail:
 	} else
 #endif
 	{
-		if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-		if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-		if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+		if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+		if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+		if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO__1g_1utf8_1to_1utf16___3BI_3I_3I_3I
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BI_3I_3I_3I)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+#if (!defined(NO__1g_1utf8_1to_1utf16___3BI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16___3BJ_3J_3J_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BI_3I_3I_3I)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+#endif
 {
 	jbyte *lparg0=NULL;
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -3536,11 +3558,11 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BI_3I_3I_3I)
 #endif
 	{
 		if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-		if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-		if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-		if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+		if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+		if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+		if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)g_utf8_to_utf16((const gchar *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
+	rc = (jintLong)g_utf8_to_utf16((const gchar *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -3551,34 +3573,38 @@ fail:
 	} else
 #endif
 	{
-		if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-		if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-		if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+		if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+		if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+		if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 		if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO__1g_1value_1peek_1pointer
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1value_1peek_1pointer)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1value_1peek_1pointer)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1value_1peek_1pointer_FUNC);
-	rc = (jint)g_value_peek_pointer((const GValue *)arg0);
+	rc = (jintLong)g_value_peek_pointer((const GValue *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1value_1peek_1pointer_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1atom_1intern
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1atom_1intern)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1atom_1intern)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jboolean arg1)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1atom_1intern_FUNC);
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -3588,7 +3614,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1atom_1intern)
 	{
 		if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)gdk_atom_intern((const gchar *)lparg0, arg1);
+	rc = (jintLong)gdk_atom_intern((const gchar *)lparg0, arg1);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -3604,12 +3630,12 @@ fail:
 #endif
 
 #ifndef NO__1gdk_1atom_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1atom_1name)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1atom_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1atom_1name_FUNC);
-	rc = (jint)gdk_atom_name((GdkAtom)arg0);
+	rc = (jintLong)gdk_atom_name((GdkAtom)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1atom_1name_FUNC);
 	return rc;
 }
@@ -3626,11 +3652,11 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1beep)
 #endif
 
 #ifndef NO__1gdk_1bitmap_1create_1from_1data
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1bitmap_1create_1from_1data)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1bitmap_1create_1from_1data)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3)
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1bitmap_1create_1from_1data_FUNC);
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -3640,7 +3666,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1bitmap_1create_1from_1data)
 	{
 		if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)gdk_bitmap_create_from_data((GdkWindow *)arg0, (const gchar *)lparg1, (gint)arg2, (gint)arg3);
+	rc = (jintLong)gdk_bitmap_create_from_data((GdkWindow *)arg0, (const gchar *)lparg1, (gint)arg2, (gint)arg3);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -3657,24 +3683,16 @@ fail:
 
 #ifndef NO__1gdk_1cairo_1region
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1region)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1region_FUNC);
 /*
 	gdk_cairo_region(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_cairo_region_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_cairo_region");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gdk_cairo_region)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1region_FUNC);
@@ -3683,7 +3701,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1region)
 
 #ifndef NO__1gdk_1cairo_1set_1source_1color
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1color)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkColor _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1color_FUNC);
@@ -3692,17 +3710,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1color)
 	gdk_cairo_set_source_color(arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, GdkColor *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_cairo_set_source_color_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_cairo_set_source_color");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, lparg1);
+		LOAD_FUNCTION(fp, gdk_cairo_set_source_color)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, GdkColor *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -3713,7 +3723,7 @@ fail:
 
 #ifndef NO__1gdk_1color_1white
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1color_1white)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkColor _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -3729,7 +3739,7 @@ fail:
 
 #ifndef NO__1gdk_1colormap_1alloc_1color
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1colormap_1alloc_1color)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jboolean arg2, jboolean arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2, jboolean arg3)
 {
 	GdkColor _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -3745,7 +3755,7 @@ fail:
 
 #ifndef NO__1gdk_1colormap_1free_1colors
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1colormap_1free_1colors)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 {
 	GdkColor _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1free_1colors_FUNC);
@@ -3757,12 +3767,12 @@ fail:
 #endif
 
 #ifndef NO__1gdk_1colormap_1get_1system
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1colormap_1get_1system)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1colormap_1get_1system)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1get_1system_FUNC);
-	rc = (jint)gdk_colormap_get_system();
+	rc = (jintLong)gdk_colormap_get_system();
 	OS_NATIVE_EXIT(env, that, _1gdk_1colormap_1get_1system_FUNC);
 	return rc;
 }
@@ -3770,7 +3780,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1colormap_1get_1system)
 
 #ifndef NO__1gdk_1colormap_1query_1color
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1colormap_1query_1color)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1query_1color_FUNC);
@@ -3784,7 +3794,7 @@ fail:
 
 #ifndef NO__1gdk_1cursor_1destroy
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cursor_1destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1destroy_FUNC);
 	gdk_cursor_destroy((GdkCursor *)arg0);
@@ -3793,39 +3803,30 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cursor_1destroy)
 #endif
 
 #ifndef NO__1gdk_1cursor_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1cursor_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_FUNC);
-	rc = (jint)gdk_cursor_new((GdkCursorType)arg0);
+	rc = (jintLong)gdk_cursor_new((GdkCursorType)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1cursor_1new_1from_1pixbuf
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1pixbuf_FUNC);
 /*
-	rc = (jint)gdk_cursor_new_from_pixbuf(arg0, arg1, arg2, arg3);
+	rc = (jintLong)gdk_cursor_new_from_pixbuf(arg0, arg1, arg2, arg3);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, jint, jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_cursor_new_from_pixbuf_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_cursor_new_from_pixbuf");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, arg2, arg3);
+		LOAD_FUNCTION(fp, gdk_cursor_new_from_pixbuf)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1pixbuf_FUNC);
@@ -3834,16 +3835,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf)
 #endif
 
 #ifndef NO__1gdk_1cursor_1new_1from_1pixmap
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixmap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jint arg4, jint arg5)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixmap)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jint arg4, jint arg5)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	GdkColor _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1pixmap_FUNC);
 	if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)gdk_cursor_new_from_pixmap((GdkPixmap *)arg0, (GdkPixmap *)arg1, (GdkColor *)lparg2, (GdkColor *)lparg3, (gint)arg4, (gint)arg5);
+	rc = (jintLong)gdk_cursor_new_from_pixmap((GdkPixmap *)arg0, (GdkPixmap *)arg1, (GdkColor *)lparg2, (GdkColor *)lparg3, (gint)arg4, (gint)arg5);
 fail:
 	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1pixmap_FUNC);
 	return rc;
@@ -3851,27 +3852,18 @@ fail:
 #endif
 
 #ifndef NO__1gdk_1display_1get_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1display_1get_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1display_1get_1default)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1display_1get_1default_FUNC);
 /*
-	rc = (jint)gdk_display_get_default();
+	rc = (jintLong)gdk_display_get_default();
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)();
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_display_get_default_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_display_get_default");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)();
+		LOAD_FUNCTION(fp, gdk_display_get_default)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1display_1get_1default_FUNC);
@@ -3881,7 +3873,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1display_1get_1default)
 
 #ifndef NO__1gdk_1display_1supports_1cursor_1color
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1display_1supports_1cursor_1color)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1display_1supports_1cursor_1color_FUNC);
@@ -3889,18 +3881,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1display_1supports_1cursor_1color)
 	rc = (jboolean)gdk_display_supports_cursor_color(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_display_supports_cursor_color_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_display_supports_cursor_color");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gdk_display_supports_cursor_color)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1display_1supports_1cursor_1color_FUNC);
@@ -3910,7 +3893,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1display_1supports_1cursor_1color)
 
 #ifndef NO__1gdk_1drag_1status
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1drag_1status)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1drag_1status_FUNC);
 	gdk_drag_status((GdkDragContext *)arg0, (GdkDragAction)arg1, (guint32)arg2);
@@ -3920,7 +3903,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1drag_1status)
 
 #ifndef NO__1gdk_1draw_1arc
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1arc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1arc_FUNC);
 	gdk_draw_arc((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8);
@@ -3930,7 +3913,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1arc)
 
 #ifndef NO__1gdk_1draw_1drawable
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1drawable)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1drawable_FUNC);
 	gdk_draw_drawable((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkDrawable *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8);
@@ -3940,7 +3923,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1drawable)
 
 #ifndef NO__1gdk_1draw_1image
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1image)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1image_FUNC);
 	gdk_draw_image((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkImage *)arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -3950,7 +3933,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1image)
 
 #ifndef NO__1gdk_1draw_1layout
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1layout)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1layout_FUNC);
 	gdk_draw_layout((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (PangoLayout *)arg4);
@@ -3960,7 +3943,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1layout)
 
 #ifndef NO__1gdk_1draw_1layout_1with_1colors
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1layout_1with_1colors)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jobject arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4, jobject arg5, jobject arg6)
 {
 	GdkColor _arg5, *lparg5=NULL;
 	GdkColor _arg6, *lparg6=NULL;
@@ -3975,7 +3958,7 @@ fail:
 
 #ifndef NO__1gdk_1draw_1line
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1line)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1line_FUNC);
 	gdk_draw_line((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5);
@@ -3985,7 +3968,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1line)
 
 #ifndef NO__1gdk_1draw_1lines
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1lines)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3)
 {
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1lines_FUNC);
@@ -4013,24 +3996,16 @@ fail:
 
 #ifndef NO__1gdk_1draw_1pixbuf
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1pixbuf)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1pixbuf_FUNC);
 /*
 	gdk_draw_pixbuf((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkPixbuf *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, (GdkRgbDither)arg9, (gint)arg10, (gint)arg11);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GdkDrawable *, GdkGC *, GdkPixbuf *, gint, gint, gint, gint, gint, gint, GdkRgbDither, gint, gint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_draw_pixbuf_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_draw_pixbuf");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkPixbuf *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, (GdkRgbDither)arg9, (gint)arg10, (gint)arg11);
+		LOAD_FUNCTION(fp, gdk_draw_pixbuf)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkDrawable *, GdkGC *, GdkPixbuf *, gint, gint, gint, gint, gint, gint, GdkRgbDither, gint, gint))fp)((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkPixbuf *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, (GdkRgbDither)arg9, (gint)arg10, (gint)arg11);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1draw_1pixbuf_FUNC);
@@ -4039,7 +4014,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1pixbuf)
 
 #ifndef NO__1gdk_1draw_1point
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1point)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1point_FUNC);
 	gdk_draw_point((GdkDrawable *)arg0, (GdkGC *)arg1, arg2, arg3);
@@ -4049,7 +4024,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1point)
 
 #ifndef NO__1gdk_1draw_1polygon
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1polygon)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4)
 {
 	jint *lparg3=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1polygon_FUNC);
@@ -4077,7 +4052,7 @@ fail:
 
 #ifndef NO__1gdk_1draw_1rectangle
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1rectangle)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1rectangle_FUNC);
 	gdk_draw_rectangle((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6);
@@ -4087,7 +4062,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1rectangle)
 
 #ifndef NO__1gdk_1drawable_1get_1depth
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1depth)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1depth_FUNC);
@@ -4098,12 +4073,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1depth)
 #endif
 
 #ifndef NO__1gdk_1drawable_1get_1image
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1image)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drawable_1get_1image)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1image_FUNC);
-	rc = (jint)gdk_drawable_get_image((GdkDrawable *)arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
+	rc = (jintLong)gdk_drawable_get_image((GdkDrawable *)arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
 	OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1image_FUNC);
 	return rc;
 }
@@ -4111,7 +4086,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1image)
 
 #ifndef NO__1gdk_1drawable_1get_1size
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1drawable_1get_1size)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -4143,12 +4118,12 @@ fail:
 #endif
 
 #ifndef NO__1gdk_1drawable_1get_1visible_1region
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1visible_1region)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drawable_1get_1visible_1region)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1visible_1region_FUNC);
-	rc = (jint)gdk_drawable_get_visible_region((GdkDrawable *)arg0);
+	rc = (jintLong)gdk_drawable_get_visible_region((GdkDrawable *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1visible_1region_FUNC);
 	return rc;
 }
@@ -4177,12 +4152,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1error_1trap_1push)
 #endif
 
 #ifndef NO__1gdk_1event_1copy
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1copy)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1copy)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1event_1copy_FUNC);
-	rc = (jint)gdk_event_copy((GdkEvent *)arg0);
+	rc = (jintLong)gdk_event_copy((GdkEvent *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1event_1copy_FUNC);
 	return rc;
 }
@@ -4190,7 +4165,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1copy)
 
 #ifndef NO__1gdk_1event_1free
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1event_1free_FUNC);
 	gdk_event_free((GdkEvent *)arg0);
@@ -4199,12 +4174,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1free)
 #endif
 
 #ifndef NO__1gdk_1event_1get
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1get)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_FUNC);
-	rc = (jint)gdk_event_get();
+	rc = (jintLong)gdk_event_get();
 	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_FUNC);
 	return rc;
 }
@@ -4212,7 +4187,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get)
 
 #ifndef NO__1gdk_1event_1get_1coords
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1coords)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
 {
 	jdouble *lparg1=NULL;
 	jdouble *lparg2=NULL;
@@ -4230,12 +4205,12 @@ fail:
 #endif
 
 #ifndef NO__1gdk_1event_1get_1graphics_1expose
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1graphics_1expose)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1get_1graphics_1expose)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1graphics_1expose_FUNC);
-	rc = (jint)gdk_event_get_graphics_expose((GdkWindow *)arg0);
+	rc = (jintLong)gdk_event_get_graphics_expose((GdkWindow *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1graphics_1expose_FUNC);
 	return rc;
 }
@@ -4243,7 +4218,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1graphics_1expose)
 
 #ifndef NO__1gdk_1event_1get_1root_1coords
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1root_1coords)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
 {
 	jdouble *lparg1=NULL;
 	jdouble *lparg2=NULL;
@@ -4262,7 +4237,7 @@ fail:
 
 #ifndef NO__1gdk_1event_1get_1state
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1state)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
 {
 	jint *lparg1=NULL;
 	jboolean rc = 0;
@@ -4278,7 +4253,7 @@ fail:
 
 #ifndef NO__1gdk_1event_1get_1time
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1time)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1time_FUNC);
@@ -4290,7 +4265,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1time)
 
 #ifndef NO__1gdk_1event_1handler_1set
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1handler_1set)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1event_1handler_1set_FUNC);
 	gdk_event_handler_set((GdkEventFunc)arg0, (gpointer)arg1, (GDestroyNotify)arg2);
@@ -4299,24 +4274,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1handler_1set)
 #endif
 
 #ifndef NO__1gdk_1event_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1new)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1event_1new_FUNC);
-	rc = (jint)gdk_event_new(arg0);
+	rc = (jintLong)gdk_event_new(arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1event_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1event_1peek
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1peek)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1peek)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1event_1peek_FUNC);
-	rc = (jint)gdk_event_peek();
+	rc = (jintLong)gdk_event_peek();
 	OS_NATIVE_EXIT(env, that, _1gdk_1event_1peek_FUNC);
 	return rc;
 }
@@ -4324,7 +4299,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1peek)
 
 #ifndef NO__1gdk_1event_1put
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1put)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1event_1put_FUNC);
 	gdk_event_put((GdkEvent *)arg0);
@@ -4344,7 +4319,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1flush)
 
 #ifndef NO__1gdk_1free_1text_1list
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1free_1text_1list)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1free_1text_1list_FUNC);
 	gdk_free_text_list((gchar **)arg0);
@@ -4354,7 +4329,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1free_1text_1list)
 
 #ifndef NO__1gdk_1gc_1get_1values
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1get_1values)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkGCValues _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1get_1values_FUNC);
@@ -4367,12 +4342,12 @@ fail:
 #endif
 
 #ifndef NO__1gdk_1gc_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1gc_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1gc_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1new_FUNC);
-	rc = (jint)gdk_gc_new((GdkDrawable *)arg0);
+	rc = (jintLong)gdk_gc_new((GdkDrawable *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1new_FUNC);
 	return rc;
 }
@@ -4380,7 +4355,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1gc_1new)
 
 #ifndef NO__1gdk_1gc_1set_1background
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1background)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkColor _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1background_FUNC);
@@ -4393,7 +4368,7 @@ fail:
 
 #ifndef NO__1gdk_1gc_1set_1clip_1mask
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1mask)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1clip_1mask_FUNC);
 	gdk_gc_set_clip_mask((GdkGC *)arg0, (GdkBitmap *)arg1);
@@ -4403,7 +4378,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1mask)
 
 #ifndef NO__1gdk_1gc_1set_1clip_1origin
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1origin)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1clip_1origin_FUNC);
 	gdk_gc_set_clip_origin((GdkGC *)arg0, (gint)arg1, (gint)arg2);
@@ -4413,7 +4388,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1origin)
 
 #ifndef NO__1gdk_1gc_1set_1clip_1rectangle
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1rectangle)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1clip_1rectangle_FUNC);
@@ -4426,7 +4401,7 @@ fail:
 
 #ifndef NO__1gdk_1gc_1set_1clip_1region
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1region)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1clip_1region_FUNC);
 	gdk_gc_set_clip_region((GdkGC *)arg0, (GdkRegion *)arg1);
@@ -4436,7 +4411,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1region)
 
 #ifndef NO__1gdk_1gc_1set_1dashes
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1dashes)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
 {
 	jbyte *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1dashes_FUNC);
@@ -4464,7 +4439,7 @@ fail:
 
 #ifndef NO__1gdk_1gc_1set_1exposures
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1exposures)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1exposures_FUNC);
 	gdk_gc_set_exposures((GdkGC *)arg0, (gboolean)arg1);
@@ -4474,7 +4449,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1exposures)
 
 #ifndef NO__1gdk_1gc_1set_1fill
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1fill)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1fill_FUNC);
 	gdk_gc_set_fill((GdkGC *)arg0, (GdkFill)arg1);
@@ -4484,7 +4459,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1fill)
 
 #ifndef NO__1gdk_1gc_1set_1foreground
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1foreground)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkColor _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1foreground_FUNC);
@@ -4497,7 +4472,7 @@ fail:
 
 #ifndef NO__1gdk_1gc_1set_1function
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1function)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1function_FUNC);
 	gdk_gc_set_function((GdkGC *)arg0, (GdkFunction)arg1);
@@ -4507,7 +4482,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1function)
 
 #ifndef NO__1gdk_1gc_1set_1line_1attributes
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1line_1attributes)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1line_1attributes_FUNC);
 	gdk_gc_set_line_attributes((GdkGC *)arg0, (gint)arg1, (GdkLineStyle)arg2, (GdkCapStyle)arg3, (GdkJoinStyle)arg4);
@@ -4517,7 +4492,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1line_1attributes)
 
 #ifndef NO__1gdk_1gc_1set_1stipple
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1stipple)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1stipple_FUNC);
 	gdk_gc_set_stipple((GdkGC *)arg0, (GdkPixmap *)arg1);
@@ -4527,7 +4502,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1stipple)
 
 #ifndef NO__1gdk_1gc_1set_1subwindow
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1subwindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1subwindow_FUNC);
 	gdk_gc_set_subwindow((GdkGC *)arg0, (GdkSubwindowMode)arg1);
@@ -4537,7 +4512,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1subwindow)
 
 #ifndef NO__1gdk_1gc_1set_1tile
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1tile)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1tile_FUNC);
 	gdk_gc_set_tile((GdkGC *)arg0, (GdkPixmap *)arg1);
@@ -4547,7 +4522,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1tile)
 
 #ifndef NO__1gdk_1gc_1set_1ts_1origin
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1ts_1origin)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1ts_1origin_FUNC);
 	gdk_gc_set_ts_origin((GdkGC *)arg0, arg1, arg2);
@@ -4557,7 +4532,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1ts_1origin)
 
 #ifndef NO__1gdk_1gc_1set_1values
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1values)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 {
 	GdkGCValues _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1values_FUNC);
@@ -4579,12 +4554,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1keyboard_1ungrab)
 #endif
 
 #ifndef NO__1gdk_1keymap_1get_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1keymap_1get_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1keymap_1get_1default)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1keymap_1get_1default_FUNC);
-	rc = (jint)gdk_keymap_get_default();
+	rc = (jintLong)gdk_keymap_get_default();
 	OS_NATIVE_EXIT(env, that, _1gdk_1keymap_1get_1default_FUNC);
 	return rc;
 }
@@ -4592,7 +4567,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1keymap_1get_1default)
 
 #ifndef NO__1gdk_1keymap_1translate_1keyboard_1state
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1keymap_1translate_1keyboard_1state)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7)
 {
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
@@ -4640,12 +4615,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1keyval_1to_1unicode)
 #endif
 
 #ifndef NO__1gdk_1pango_1context_1get
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pango_1context_1get)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pango_1context_1get)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pango_1context_1get_FUNC);
-	rc = (jint)gdk_pango_context_get();
+	rc = (jintLong)gdk_pango_context_get();
 	OS_NATIVE_EXIT(env, that, _1gdk_1pango_1context_1get_FUNC);
 	return rc;
 }
@@ -4653,7 +4628,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pango_1context_1get)
 
 #ifndef NO__1gdk_1pango_1context_1set_1colormap
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pango_1context_1set_1colormap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1pango_1context_1set_1colormap_FUNC);
 	gdk_pango_context_set_colormap((PangoContext *)arg0, (GdkColormap *)arg1);
@@ -4662,14 +4637,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pango_1context_1set_1colormap)
 #endif
 
 #ifndef NO__1gdk_1pango_1layout_1get_1clip_1region
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pango_1layout_1get_1clip_1region)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pango_1layout_1get_1clip_1region)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
 {
 	jint *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pango_1layout_1get_1clip_1region_FUNC);
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)gdk_pango_layout_get_clip_region((PangoLayout *)arg0, arg1, arg2, lparg3, arg4);
+	rc = (jintLong)gdk_pango_layout_get_clip_region((PangoLayout *)arg0, arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pango_1layout_1get_1clip_1region_FUNC);
@@ -4679,7 +4654,7 @@ fail:
 
 #ifndef NO__1gdk_1pixbuf_1copy_1area
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1copy_1area)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1copy_1area_FUNC);
 	gdk_pixbuf_copy_area((GdkPixbuf *)arg0, arg1, arg2, arg3, arg4, (GdkPixbuf *)arg5, arg6, arg7);
@@ -4688,12 +4663,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1copy_1area)
 #endif
 
 #ifndef NO__1gdk_1pixbuf_1get_1from_1drawable
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1from_1drawable)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1from_1drawable)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1from_1drawable_FUNC);
-	rc = (jint)gdk_pixbuf_get_from_drawable((GdkPixbuf *)arg0, (GdkDrawable *)arg1, (GdkColormap *)arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+	rc = (jintLong)gdk_pixbuf_get_from_drawable((GdkPixbuf *)arg0, (GdkDrawable *)arg1, (GdkColormap *)arg2, arg3, arg4, arg5, arg6, arg7, arg8);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1from_1drawable_FUNC);
 	return rc;
 }
@@ -4701,7 +4676,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1from_1drawable)
 
 #ifndef NO__1gdk_1pixbuf_1get_1has_1alpha
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1has_1alpha)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1has_1alpha_FUNC);
@@ -4713,7 +4688,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1has_1alpha)
 
 #ifndef NO__1gdk_1pixbuf_1get_1height
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1height)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1height_FUNC);
@@ -4724,12 +4699,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1height)
 #endif
 
 #ifndef NO__1gdk_1pixbuf_1get_1pixels
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1pixels)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1pixels)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1pixels_FUNC);
-	rc = (jint)gdk_pixbuf_get_pixels((const GdkPixbuf *)arg0);
+	rc = (jintLong)gdk_pixbuf_get_pixels((const GdkPixbuf *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1pixels_FUNC);
 	return rc;
 }
@@ -4737,7 +4712,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1pixels)
 
 #ifndef NO__1gdk_1pixbuf_1get_1rowstride
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1rowstride)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1rowstride_FUNC);
@@ -4749,7 +4724,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1rowstride)
 
 #ifndef NO__1gdk_1pixbuf_1get_1width
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1width)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1width_FUNC);
@@ -4761,39 +4736,39 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1width)
 
 #ifndef NO__1gdk_1pixbuf_1loader_1close
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1close)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1close_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jboolean)gdk_pixbuf_loader_close((GdkPixbufLoader *)arg0, (GError **)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1close_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1pixbuf_1loader_1get_1pixbuf
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1get_1pixbuf)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1get_1pixbuf)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC);
-	rc = (jint)gdk_pixbuf_loader_get_pixbuf((GdkPixbufLoader *)arg0);
+	rc = (jintLong)gdk_pixbuf_loader_get_pixbuf((GdkPixbufLoader *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1pixbuf_1loader_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1new_FUNC);
-	rc = (jint)gdk_pixbuf_loader_new();
+	rc = (jintLong)gdk_pixbuf_loader_new();
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1new_FUNC);
 	return rc;
 }
@@ -4801,45 +4776,45 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1new)
 
 #ifndef NO__1gdk_1pixbuf_1loader_1write
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1write)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3)
 {
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1write_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	rc = (jboolean)gdk_pixbuf_loader_write((GdkPixbufLoader *)arg0, (const guchar *)arg1, (gsize)arg2, (GError **)lparg3);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1write_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1pixbuf_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1new)
 	(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jint arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1new_FUNC);
-	rc = (jint)gdk_pixbuf_new((GdkColorspace)arg0, (gboolean)arg1, arg2, arg3, arg4);
+	rc = (jintLong)gdk_pixbuf_new((GdkColorspace)arg0, (gboolean)arg1, arg2, arg3, arg4);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1pixbuf_1new_1from_1file
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1new_1from_1file)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jintArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1new_1from_1file)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1)
 {
 	jbyte *lparg0=NULL;
-	jint *lparg1=NULL;
-	jint rc = 0;
+	jintLong *lparg1=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1new_1from_1file_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)gdk_pixbuf_new_from_file((const char *)lparg0, (GError**)lparg1);
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)gdk_pixbuf_new_from_file((const char *)lparg0, (GError**)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1new_1from_1file_FUNC);
 	return rc;
@@ -4848,24 +4823,24 @@ fail:
 
 #ifndef NO__1gdk_1pixbuf_1render_1pixmap_1and_1mask
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1pixmap_1and_1mask)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jint arg3)
 {
-	jint *lparg1=NULL;
-	jint *lparg2=NULL;
+	jintLong *lparg1=NULL;
+	jintLong *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1render_1pixmap_1and_1mask_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gdk_pixbuf_render_pixmap_and_mask((GdkPixbuf *)arg0, (GdkDrawable **)lparg1, (GdkBitmap **)lparg2, arg3);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1render_1pixmap_1and_1mask_FUNC);
 }
 #endif
 
 #ifndef NO__1gdk_1pixbuf_1render_1to_1drawable
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1to_1drawable)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1render_1to_1drawable_FUNC);
 	gdk_pixbuf_render_to_drawable((GdkPixbuf *)arg0, (GdkDrawable *)arg1, (GdkGC *)arg2, arg3, arg4, arg5, arg6, arg7, arg8, (GdkRgbDither)arg9, arg10, arg11);
@@ -4875,7 +4850,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1to_1drawable)
 
 #ifndef NO__1gdk_1pixbuf_1render_1to_1drawable_1alpha
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1to_1drawable_1alpha)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1render_1to_1drawable_1alpha_FUNC);
 	gdk_pixbuf_render_to_drawable_alpha((GdkPixbuf *)arg0, (GdkDrawable *)arg1, arg2, arg3, arg4, arg5, arg6, arg7, (GdkPixbufAlphaMode)arg8, arg9, (GdkRgbDither)arg10, arg11, arg12);
@@ -4885,44 +4860,35 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1to_1drawable_1alpha)
 
 #ifndef NO__1gdk_1pixbuf_1save_1to_1buffer
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1save_1to_1buffer)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jbyteArray arg3, jintArray arg4, jbyteArray arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2, jbyteArray arg3, jintLongArray arg4, jbyteArray arg5)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint *lparg2=NULL;
 	jbyte *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jbyte *lparg5=NULL;
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1save_1to_1buffer_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail;
 /*
 	rc = (jboolean)gdk_pixbuf_save_to_buffer((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (GError **)lparg4, (char *)lparg5);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(GdkPixbuf *, gchar **, gsize *, const char *, GError **, char *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_pixbuf_save_to_buffer_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_pixbuf_save_to_buffer");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (GError **)lparg4, (char *)lparg5);
+		LOAD_FUNCTION(fp, gdk_pixbuf_save_to_buffer)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GdkPixbuf *, gchar **, gsize *, const char *, GError **, char *))fp)((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (GError **)lparg4, (char *)lparg5);
 		}
 	}
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0);
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1save_1to_1buffer_FUNC);
 	return rc;
 }
@@ -4930,7 +4896,7 @@ fail:
 
 #ifndef NO__1gdk_1pixbuf_1scale
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jdouble arg6, jdouble arg7, jdouble arg8, jdouble arg9, jint arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jdouble arg6, jdouble arg7, jdouble arg8, jdouble arg9, jint arg10)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1scale_FUNC);
 	gdk_pixbuf_scale((const GdkPixbuf *)arg0, (GdkPixbuf *)arg1, arg2, arg3, arg4, arg5, (double)arg6, (double)arg7, (double)arg8, (double)arg9, arg10);
@@ -4939,36 +4905,36 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale)
 #endif
 
 #ifndef NO__1gdk_1pixbuf_1scale_1simple
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale_1simple)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale_1simple)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1scale_1simple_FUNC);
-	rc = (jint)gdk_pixbuf_scale_simple((const GdkPixbuf *)arg0, arg1, arg2, (GdkInterpType)arg3);
+	rc = (jintLong)gdk_pixbuf_scale_simple((const GdkPixbuf *)arg0, arg1, arg2, (GdkInterpType)arg3);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1scale_1simple_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1pixmap_1foreign_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixmap_1foreign_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixmap_1foreign_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixmap_1foreign_1new_FUNC);
-	rc = (jint)gdk_pixmap_foreign_new(arg0);
+	rc = (jintLong)gdk_pixmap_foreign_new(arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixmap_1foreign_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1pixmap_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixmap_1new)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixmap_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pixmap_1new_FUNC);
-	rc = (jint)gdk_pixmap_new((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3);
+	rc = (jintLong)gdk_pixmap_new((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3);
 	OS_NATIVE_EXIT(env, that, _1gdk_1pixmap_1new_FUNC);
 	return rc;
 }
@@ -4976,7 +4942,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixmap_1new)
 
 #ifndef NO__1gdk_1pointer_1grab
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pointer_1grab)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jint arg2, jintLong arg3, jintLong arg4, jint arg5)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1pointer_1grab_FUNC);
@@ -5010,24 +4976,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pointer_1ungrab)
 
 #ifndef NO__1gdk_1property_1get
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1property_1get)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8, jintArray arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jintLongArray arg6, jintArray arg7, jintArray arg8, jintLongArray arg9)
 {
-	jint *lparg6=NULL;
+	jintLong *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
-	jint *lparg9=NULL;
+	jintLong *lparg9=NULL;
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1property_1get_FUNC);
-	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = (*env)->GetIntArrayElements(env, arg8, NULL)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = (*env)->GetIntArrayElements(env, arg9, NULL)) == NULL) goto fail;
+	if (arg9) if ((lparg9 = (*env)->GetIntLongArrayElements(env, arg9, NULL)) == NULL) goto fail;
 	rc = (jboolean)gdk_property_get((GdkWindow *)arg0, (GdkAtom)arg1, (GdkAtom)arg2, arg3, arg4, arg5, (GdkAtom *)lparg6, (gint *)lparg7, (gint *)lparg8, (guchar **)lparg9);
 fail:
-	if (arg9 && lparg9) (*env)->ReleaseIntArrayElements(env, arg9, lparg9, 0);
+	if (arg9 && lparg9) (*env)->ReleaseIntLongArrayElements(env, arg9, lparg9, 0);
 	if (arg8 && lparg8) (*env)->ReleaseIntArrayElements(env, arg8, lparg8, 0);
 	if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
-	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
+	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1property_1get_FUNC);
 	return rc;
 }
@@ -5035,7 +5001,7 @@ fail:
 
 #ifndef NO__1gdk_1region_1destroy
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1destroy_FUNC);
 	gdk_region_destroy((GdkRegion *)arg0);
@@ -5045,7 +5011,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1destroy)
 
 #ifndef NO__1gdk_1region_1empty
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1empty)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1empty_FUNC);
@@ -5057,7 +5023,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1empty)
 
 #ifndef NO__1gdk_1region_1get_1clipbox
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1get_1clipbox)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1get_1clipbox_FUNC);
@@ -5071,24 +5037,24 @@ fail:
 
 #ifndef NO__1gdk_1region_1get_1rectangles
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1get_1rectangles)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1get_1rectangles_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gdk_region_get_rectangles((GdkRegion *)arg0, (GdkRectangle **)lparg1, (gint *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1region_1get_1rectangles_FUNC);
 }
 #endif
 
 #ifndef NO__1gdk_1region_1intersect
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1intersect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1intersect_FUNC);
 	gdk_region_intersect((GdkRegion *)arg0, (GdkRegion *)arg1);
@@ -5097,12 +5063,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1intersect)
 #endif
 
 #ifndef NO__1gdk_1region_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1new_FUNC);
-	rc = (jint)gdk_region_new();
+	rc = (jintLong)gdk_region_new();
 	OS_NATIVE_EXIT(env, that, _1gdk_1region_1new_FUNC);
 	return rc;
 }
@@ -5110,7 +5076,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1new)
 
 #ifndef NO__1gdk_1region_1offset
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1offset)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1offset_FUNC);
 	gdk_region_offset((GdkRegion *)arg0, (gint)arg1, (gint)arg2);
@@ -5120,7 +5086,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1offset)
 
 #ifndef NO__1gdk_1region_1point_1in
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1point_1in)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1point_1in_FUNC);
@@ -5131,14 +5097,14 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1point_1in)
 #endif
 
 #ifndef NO__1gdk_1region_1polygon
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1polygon)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1polygon)
 	(JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
 {
 	jint *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1polygon_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gdk_region_polygon((GdkPoint *)lparg0, arg1, (GdkFillRule)arg2);
+	rc = (jintLong)gdk_region_polygon((GdkPoint *)lparg0, arg1, (GdkFillRule)arg2);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1region_1polygon_FUNC);
@@ -5147,14 +5113,14 @@ fail:
 #endif
 
 #ifndef NO__1gdk_1region_1rect_1in
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1rect_1in)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1rect_1in)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1rect_1in_FUNC);
 	if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)gdk_region_rect_in((GdkRegion *)arg0, (GdkRectangle *)lparg1);
+	rc = (jintLong)gdk_region_rect_in((GdkRegion *)arg0, (GdkRectangle *)lparg1);
 fail:
 	OS_NATIVE_EXIT(env, that, _1gdk_1region_1rect_1in_FUNC);
 	return rc;
@@ -5162,14 +5128,14 @@ fail:
 #endif
 
 #ifndef NO__1gdk_1region_1rectangle
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1rectangle)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1rectangle)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	GdkRectangle _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1rectangle_FUNC);
 	if (arg0) if ((lparg0 = getGdkRectangleFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)gdk_region_rectangle(lparg0);
+	rc = (jintLong)gdk_region_rectangle(lparg0);
 fail:
 	OS_NATIVE_EXIT(env, that, _1gdk_1region_1rectangle_FUNC);
 	return rc;
@@ -5178,7 +5144,7 @@ fail:
 
 #ifndef NO__1gdk_1region_1subtract
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1subtract)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1subtract_FUNC);
 	gdk_region_subtract((GdkRegion *)arg0, (GdkRegion *)arg1);
@@ -5188,7 +5154,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1subtract)
 
 #ifndef NO__1gdk_1region_1union
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1union)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1union_FUNC);
 	gdk_region_union((GdkRegion *)arg0, (GdkRegion *)arg1);
@@ -5198,7 +5164,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1union)
 
 #ifndef NO__1gdk_1region_1union_1with_1rect
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1union_1with_1rect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1region_1union_1with_1rect_FUNC);
@@ -5220,27 +5186,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1rgb_1init)
 #endif
 
 #ifndef NO__1gdk_1screen_1get_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1screen_1get_1default)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1default_FUNC);
 /*
-	rc = (jint)gdk_screen_get_default();
+	rc = (jintLong)gdk_screen_get_default();
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)();
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_screen_get_default_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_screen_get_default");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)();
+		LOAD_FUNCTION(fp, gdk_screen_get_default)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1default_FUNC);
@@ -5250,7 +5207,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1default)
 
 #ifndef NO__1gdk_1screen_1get_1monitor_1at_1point
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1at_1point_FUNC);
@@ -5258,18 +5215,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point)
 	rc = (jint)gdk_screen_get_monitor_at_point((GdkScreen *)arg0, (gint)arg1, (gint)arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(GdkScreen *, gint, gint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_screen_get_monitor_at_point_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_screen_get_monitor_at_point");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((GdkScreen *)arg0, (gint)arg1, (gint)arg2);
+		LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_point)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, gint, gint))fp)((GdkScreen *)arg0, (gint)arg1, (gint)arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1at_1point_FUNC);
@@ -5279,7 +5227,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point)
 
 #ifndef NO__1gdk_1screen_1get_1monitor_1at_1window
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1at_1window_FUNC);
@@ -5287,18 +5235,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window)
 	rc = (jint)gdk_screen_get_monitor_at_window((GdkScreen *)arg0, (GdkWindow *)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(GdkScreen *, GdkWindow *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_screen_get_monitor_at_window_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_screen_get_monitor_at_window");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((GdkScreen *)arg0, (GdkWindow *)arg1);
+		LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_window)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, GdkWindow *))fp)((GdkScreen *)arg0, (GdkWindow *)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1at_1window_FUNC);
@@ -5308,7 +5247,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window)
 
 #ifndef NO__1gdk_1screen_1get_1monitor_1geometry
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1geometry)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkRectangle _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1geometry_FUNC);
@@ -5317,17 +5256,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1geometry)
 	gdk_screen_get_monitor_geometry((GdkScreen *)arg0, arg1, lparg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GdkScreen *, jint, GdkRectangle *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_screen_get_monitor_geometry_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_screen_get_monitor_geometry");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GdkScreen *)arg0, arg1, lparg2);
+		LOAD_FUNCTION(fp, gdk_screen_get_monitor_geometry)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkScreen *, jint, GdkRectangle *))fp)((GdkScreen *)arg0, arg1, lparg2);
 		}
 	}
 fail:
@@ -5338,7 +5269,7 @@ fail:
 
 #ifndef NO__1gdk_1screen_1get_1n_1monitors
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1n_1monitors)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1n_1monitors_FUNC);
@@ -5346,18 +5277,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1n_1monitors)
 	rc = (jint)gdk_screen_get_n_monitors((GdkScreen *)arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(GdkScreen *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_screen_get_n_monitors_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_screen_get_n_monitors");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((GdkScreen *)arg0);
+		LOAD_FUNCTION(fp, gdk_screen_get_n_monitors)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1n_1monitors_FUNC);
@@ -5367,7 +5289,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1n_1monitors)
 
 #ifndef NO__1gdk_1screen_1get_1number
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1number)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1number_FUNC);
@@ -5375,18 +5297,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1number)
 	rc = (jint)gdk_screen_get_number((GdkScreen *)arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(GdkScreen *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_screen_get_number_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_screen_get_number");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((GdkScreen *)arg0);
+		LOAD_FUNCTION(fp, gdk_screen_get_number)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1number_FUNC);
@@ -5446,15 +5359,15 @@ fail:
 
 #ifndef NO__1gdk_1text_1property_1to_1utf8_1list
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1text_1property_1to_1utf8_1list)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3, jintLongArray arg4)
 {
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1text_1property_1to_1utf8_1list_FUNC);
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)gdk_text_property_to_utf8_list((GdkAtom)arg0, arg1, (guchar *)arg2, arg3, (gchar ***)lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1text_1property_1to_1utf8_1list_FUNC);
 	return rc;
 }
@@ -5474,26 +5387,26 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1unicode_1to_1keyval)
 
 #ifndef NO__1gdk_1utf8_1to_1compound_1text
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1utf8_1to_1compound_1text)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jintArray arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1, jintArray arg2, jintLongArray arg3, jintArray arg4)
 {
 	jbyte *lparg0=NULL;
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint *lparg4=NULL;
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1utf8_1to_1compound_1text_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jboolean)gdk_utf8_to_compound_text((const gchar *)lparg0, (GdkAtom *)lparg1, (gint *)lparg2, (guchar **)lparg3, (gint *)lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1utf8_1to_1compound_1text_FUNC);
 	return rc;
@@ -5501,14 +5414,14 @@ fail:
 #endif
 
 #ifndef NO__1gdk_1utf8_1to_1string_1target
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1utf8_1to_1string_1target)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1utf8_1to_1string_1target)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1utf8_1to_1string_1target_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gdk_utf8_to_string_target((const gchar *)lparg0);
+	rc = (jintLong)gdk_utf8_to_string_target((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1utf8_1to_1string_1target_FUNC);
@@ -5517,12 +5430,12 @@ fail:
 #endif
 
 #ifndef NO__1gdk_1visual_1get_1system
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1visual_1get_1system)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1visual_1get_1system)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1visual_1get_1system_FUNC);
-	rc = (jint)gdk_visual_get_system();
+	rc = (jintLong)gdk_visual_get_system();
 	OS_NATIVE_EXIT(env, that, _1gdk_1visual_1get_1system_FUNC);
 	return rc;
 }
@@ -5530,7 +5443,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1visual_1get_1system)
 
 #ifndef NO__1gdk_1window_1add_1filter
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1add_1filter)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1add_1filter_FUNC);
 	gdk_window_add_filter((GdkWindow *)arg0, (GdkFilterFunc)arg1, (gpointer)arg2);
@@ -5539,16 +5452,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1add_1filter)
 #endif
 
 #ifndef NO__1gdk_1window_1at_1pointer
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1at_1pointer)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1at_1pointer)
 	(JNIEnv *env, jclass that, jintArray arg0, jintArray arg1)
 {
 	jint *lparg0=NULL;
 	jint *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1at_1pointer_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)gdk_window_at_pointer((gint *)lparg0, (gint *)lparg1);
+	rc = (jintLong)gdk_window_at_pointer((gint *)lparg0, (gint *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
@@ -5559,7 +5472,7 @@ fail:
 
 #ifndef NO__1gdk_1window_1begin_1paint_1rect
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1begin_1paint_1rect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1begin_1paint_1rect_FUNC);
@@ -5572,7 +5485,7 @@ fail:
 
 #ifndef NO__1gdk_1window_1clear_1area
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1clear_1area)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1clear_1area_FUNC);
 	gdk_window_clear_area((GdkWindow *)arg0, arg1, arg2, arg3, arg4);
@@ -5582,7 +5495,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1clear_1area)
 
 #ifndef NO__1gdk_1window_1destroy
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1destroy_FUNC);
 	gdk_window_destroy((GdkWindow *)arg0);
@@ -5592,7 +5505,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1destroy)
 
 #ifndef NO__1gdk_1window_1end_1paint
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1end_1paint)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1end_1paint_FUNC);
 	gdk_window_end_paint((GdkWindow *)arg0);
@@ -5602,7 +5515,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1end_1paint)
 
 #ifndef NO__1gdk_1window_1focus
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1focus)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1focus_FUNC);
 	gdk_window_focus((GdkWindow *)arg0, arg1);
@@ -5612,7 +5525,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1focus)
 
 #ifndef NO__1gdk_1window_1freeze_1updates
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1freeze_1updates)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1freeze_1updates_FUNC);
 	gdk_window_freeze_updates((GdkWindow *)arg0);
@@ -5621,12 +5534,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1freeze_1updates)
 #endif
 
 #ifndef NO__1gdk_1window_1get_1children
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1children)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1children)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1children_FUNC);
-	rc = (jint)gdk_window_get_children((GdkWindow *)arg0);
+	rc = (jintLong)gdk_window_get_children((GdkWindow *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1children_FUNC);
 	return rc;
 }
@@ -5634,7 +5547,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1children)
 
 #ifndef NO__1gdk_1window_1get_1events
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1events)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1events_FUNC);
@@ -5646,7 +5559,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1events)
 
 #ifndef NO__1gdk_1window_1get_1frame_1extents
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1frame_1extents)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1frame_1extents_FUNC);
@@ -5660,27 +5573,27 @@ fail:
 
 #ifndef NO__1gdk_1window_1get_1internal_1paint_1info
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1internal_1paint_1info)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2, jintArray arg3)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1internal_1paint_1info_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gdk_window_get_internal_paint_info((GdkWindow *)arg0, (GdkDrawable **)lparg1, (gint *)lparg2, (gint *)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1internal_1paint_1info_FUNC);
 }
 #endif
 
 #ifndef NO__1gdk_1window_1get_1origin
 JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1origin)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -5698,30 +5611,30 @@ fail:
 #endif
 
 #ifndef NO__1gdk_1window_1get_1parent
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1parent)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1parent)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1parent_FUNC);
-	rc = (jint)gdk_window_get_parent((GdkWindow *)arg0);
+	rc = (jintLong)gdk_window_get_parent((GdkWindow *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1parent_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1window_1get_1pointer
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1pointer)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jintArray arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1pointer)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2, jintArray arg3)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1pointer_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)gdk_window_get_pointer((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2, (GdkModifierType *)lparg3);
+	rc = (jintLong)gdk_window_get_pointer((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2, (GdkModifierType *)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
@@ -5733,7 +5646,7 @@ fail:
 
 #ifndef NO__1gdk_1window_1get_1position
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1position)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -5750,21 +5663,21 @@ fail:
 
 #ifndef NO__1gdk_1window_1get_1user_1data
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1user_1data)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1user_1data_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gdk_window_get_user_data((GdkWindow *)arg0, (gpointer *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1user_1data_FUNC);
 }
 #endif
 
 #ifndef NO__1gdk_1window_1hide
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1hide)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1hide_FUNC);
 	gdk_window_hide((GdkWindow *)arg0);
@@ -5774,7 +5687,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1hide)
 
 #ifndef NO__1gdk_1window_1invalidate_1rect
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1invalidate_1rect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1invalidate_1rect_FUNC);
@@ -5787,7 +5700,7 @@ fail:
 
 #ifndef NO__1gdk_1window_1invalidate_1region
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1invalidate_1region)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1invalidate_1region_FUNC);
 	gdk_window_invalidate_region((GdkWindow *)arg0, (GdkRegion *)arg1, (gboolean)arg2);
@@ -5797,7 +5710,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1invalidate_1region)
 
 #ifndef NO__1gdk_1window_1is_1visible
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1window_1is_1visible)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1is_1visible_FUNC);
@@ -5808,12 +5721,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1window_1is_1visible)
 #endif
 
 #ifndef NO__1gdk_1window_1lookup
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1lookup)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1lookup)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1lookup_FUNC);
-	rc = (jint)gdk_window_lookup(arg0);
+	rc = (jintLong)gdk_window_lookup(arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1window_1lookup_FUNC);
 	return rc;
 }
@@ -5821,7 +5734,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1lookup)
 
 #ifndef NO__1gdk_1window_1lower
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1lower)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1lower_FUNC);
 	gdk_window_lower((GdkWindow *)arg0);
@@ -5831,7 +5744,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1lower)
 
 #ifndef NO__1gdk_1window_1move
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1move)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1move_FUNC);
 	gdk_window_move((GdkWindow *)arg0, arg1, arg2);
@@ -5840,14 +5753,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1move)
 #endif
 
 #ifndef NO__1gdk_1window_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1new)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 {
 	GdkWindowAttr _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1new_FUNC);
 	if (arg1) if ((lparg1 = getGdkWindowAttrFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)gdk_window_new((GdkWindow *)arg0, lparg1, arg2);
+	rc = (jintLong)gdk_window_new((GdkWindow *)arg0, lparg1, arg2);
 fail:
 	OS_NATIVE_EXIT(env, that, _1gdk_1window_1new_FUNC);
 	return rc;
@@ -5866,7 +5779,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1process_1all_1updates)
 
 #ifndef NO__1gdk_1window_1process_1updates
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1process_1updates)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1process_1updates_FUNC);
 	gdk_window_process_updates((GdkWindow *)arg0, (gboolean)arg1);
@@ -5876,7 +5789,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1process_1updates)
 
 #ifndef NO__1gdk_1window_1raise
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1raise)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1raise_FUNC);
 	gdk_window_raise((GdkWindow *)arg0);
@@ -5886,7 +5799,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1raise)
 
 #ifndef NO__1gdk_1window_1remove_1filter
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1remove_1filter)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1remove_1filter_FUNC);
 	gdk_window_remove_filter((GdkWindow *)arg0, (GdkFilterFunc)arg1, (gpointer)arg2);
@@ -5896,7 +5809,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1remove_1filter)
 
 #ifndef NO__1gdk_1window_1resize
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1resize)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1resize_FUNC);
 	gdk_window_resize((GdkWindow *)arg0, arg1, arg2);
@@ -5906,7 +5819,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1resize)
 
 #ifndef NO__1gdk_1window_1scroll
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1scroll)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1scroll_FUNC);
 	gdk_window_scroll((GdkWindow *)arg0, arg1, arg2);
@@ -5916,24 +5829,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1scroll)
 
 #ifndef NO__1gdk_1window_1set_1accept_1focus
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1accept_1focus)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1accept_1focus_FUNC);
 /*
 	gdk_window_set_accept_focus((GdkWindow *)arg0, (gboolean)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GdkWindow *, gboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_window_set_accept_focus_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_window_set_accept_focus");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GdkWindow *)arg0, (gboolean)arg1);
+		LOAD_FUNCTION(fp, gdk_window_set_accept_focus)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (gboolean)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1accept_1focus_FUNC);
@@ -5942,7 +5847,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1accept_1focus)
 
 #ifndef NO__1gdk_1window_1set_1back_1pixmap
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1back_1pixmap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1back_1pixmap_FUNC);
 	gdk_window_set_back_pixmap((GdkWindow *)arg0, (GdkPixmap *)arg1, (gboolean)arg2);
@@ -5952,7 +5857,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1back_1pixmap)
 
 #ifndef NO__1gdk_1window_1set_1cursor
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1cursor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1cursor_FUNC);
 	gdk_window_set_cursor((GdkWindow *)arg0, (GdkCursor *)arg1);
@@ -5972,7 +5877,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1debug_1updates)
 
 #ifndef NO__1gdk_1window_1set_1decorations
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1decorations)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1decorations_FUNC);
 	gdk_window_set_decorations((GdkWindow *)arg0, (GdkWMDecoration)arg1);
@@ -5982,7 +5887,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1decorations)
 
 #ifndef NO__1gdk_1window_1set_1events
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1events)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1events_FUNC);
 	gdk_window_set_events((GdkWindow *)arg0, arg1);
@@ -5992,7 +5897,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1events)
 
 #ifndef NO__1gdk_1window_1set_1icon
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1icon)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1icon_FUNC);
 	gdk_window_set_icon((GdkWindow *)arg0, (GdkWindow *)arg1, (GdkPixmap *)arg2, (GdkBitmap *)arg3);
@@ -6002,7 +5907,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1icon)
 
 #ifndef NO__1gdk_1window_1set_1icon_1list
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1icon_1list)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1icon_1list_FUNC);
 	gdk_window_set_icon_list((GdkWindow *)arg0, (GList *)arg1);
@@ -6012,24 +5917,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1icon_1list)
 
 #ifndef NO__1gdk_1window_1set_1keep_1above
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1keep_1above)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1keep_1above_FUNC);
 /*
 	gdk_window_set_keep_above((GdkWindow *)arg0, (gboolean)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GdkWindow *, gboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_window_set_keep_above_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_window_set_keep_above");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GdkWindow *)arg0, (gboolean)arg1);
+		LOAD_FUNCTION(fp, gdk_window_set_keep_above)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (gboolean)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1keep_1above_FUNC);
@@ -6038,7 +5935,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1keep_1above)
 
 #ifndef NO__1gdk_1window_1set_1override_1redirect
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1override_1redirect)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1override_1redirect_FUNC);
 	gdk_window_set_override_redirect((GdkWindow *)arg0, (gboolean)arg1);
@@ -6048,7 +5945,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1override_1redirect)
 
 #ifndef NO__1gdk_1window_1set_1user_1data
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1user_1data)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1user_1data_FUNC);
 	gdk_window_set_user_data((GdkWindow *)arg0, (gpointer)arg1);
@@ -6058,7 +5955,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1user_1data)
 
 #ifndef NO__1gdk_1window_1shape_1combine_1region
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1shape_1combine_1region)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1shape_1combine_1region_FUNC);
 	gdk_window_shape_combine_region((GdkWindow *)arg0, (GdkRegion *)arg1, arg2, arg3);
@@ -6068,7 +5965,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1shape_1combine_1region)
 
 #ifndef NO__1gdk_1window_1show
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1show_FUNC);
 	gdk_window_show((GdkWindow *)arg0);
@@ -6078,7 +5975,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show)
 
 #ifndef NO__1gdk_1window_1show_1unraised
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show_1unraised)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1show_1unraised_FUNC);
 	gdk_window_show_unraised((GdkWindow *)arg0);
@@ -6088,7 +5985,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show_1unraised)
 
 #ifndef NO__1gdk_1window_1thaw_1updates
 JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1thaw_1updates)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gdk_1window_1thaw_1updates_FUNC);
 	gdk_window_thaw_updates((GdkWindow *)arg0);
@@ -6097,75 +5994,66 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1thaw_1updates)
 #endif
 
 #ifndef NO__1gdk_1x11_1atom_1to_1xatom
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1atom_1to_1xatom)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1atom_1to_1xatom)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1atom_1to_1xatom_FUNC);
-	rc = (jint)gdk_x11_atom_to_xatom((GdkAtom)arg0);
+	rc = (jintLong)gdk_x11_atom_to_xatom((GdkAtom)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1atom_1to_1xatom_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1x11_1colormap_1get_1xcolormap
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1colormap_1get_1xcolormap)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1colormap_1get_1xcolormap)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1colormap_1get_1xcolormap_FUNC);
-	rc = (jint)gdk_x11_colormap_get_xcolormap((GdkColormap *)arg0);
+	rc = (jintLong)gdk_x11_colormap_get_xcolormap((GdkColormap *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1colormap_1get_1xcolormap_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1x11_1drawable_1get_1xdisplay
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xdisplay)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xdisplay)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1drawable_1get_1xdisplay_FUNC);
-	rc = (jint)gdk_x11_drawable_get_xdisplay((GdkDrawable *)arg0);
+	rc = (jintLong)gdk_x11_drawable_get_xdisplay((GdkDrawable *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1drawable_1get_1xdisplay_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1x11_1drawable_1get_1xid
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xid)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xid)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1drawable_1get_1xid_FUNC);
-	rc = (jint)gdk_x11_drawable_get_xid((GdkDrawable *)arg0);
+	rc = (jintLong)gdk_x11_drawable_get_xid((GdkDrawable *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1drawable_1get_1xid_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gdk_1x11_1screen_1get_1window_1manager_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1name)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC);
 /*
-	rc = (jint)gdk_x11_screen_get_window_manager_name((GdkScreen *)arg0);
+	rc = (jintLong)gdk_x11_screen_get_window_manager_name((GdkScreen *)arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(GdkScreen *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_x11_screen_get_window_manager_name_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_x11_screen_get_window_manager_name");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((GdkScreen *)arg0);
+		LOAD_FUNCTION(fp, gdk_x11_screen_get_window_manager_name)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC);
@@ -6174,27 +6062,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1name)
 #endif
 
 #ifndef NO__1gdk_1x11_1screen_1lookup_1visual
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1screen_1lookup_1visual)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1lookup_1visual)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1lookup_1visual_FUNC);
 /*
-	rc = (jint)gdk_x11_screen_lookup_visual((GdkScreen *)arg0, (VisualID)arg1);
+	rc = (jintLong)gdk_x11_screen_lookup_visual((GdkScreen *)arg0, (VisualID)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(GdkScreen *, VisualID);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gdk_x11_screen_lookup_visual_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gdk_x11_screen_lookup_visual");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((GdkScreen *)arg0, (VisualID)arg1);
+		LOAD_FUNCTION(fp, gdk_x11_screen_lookup_visual)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkScreen *, VisualID))fp)((GdkScreen *)arg0, (VisualID)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1lookup_1visual_FUNC);
@@ -6203,24 +6082,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1screen_1lookup_1visual)
 #endif
 
 #ifndef NO__1gdk_1x11_1visual_1get_1xvisual
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1visual_1get_1xvisual)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1visual_1get_1xvisual)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1visual_1get_1xvisual_FUNC);
-	rc = (jint)gdk_x11_visual_get_xvisual((GdkVisual *)arg0);
+	rc = (jintLong)gdk_x11_visual_get_xvisual((GdkVisual *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1visual_1get_1xvisual_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1accel_1group_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1accel_1group_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1accel_1group_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1accel_1group_1new_FUNC);
-	rc = (jint)gtk_accel_group_new();
+	rc = (jintLong)gtk_accel_group_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1accel_1group_1new_FUNC);
 	return rc;
 }
@@ -6228,7 +6107,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1accel_1group_1new)
 
 #ifndef NO__1gtk_1accel_1groups_1activate
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1accel_1groups_1activate)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1accel_1groups_1activate_FUNC);
@@ -6240,7 +6119,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1accel_1groups_1activate)
 
 #ifndef NO__1gtk_1accel_1label_1set_1accel_1widget
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1accel_1label_1set_1accel_1widget)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1accel_1label_1set_1accel_1widget_FUNC);
 	gtk_accel_label_set_accel_widget((GtkAccelLabel *)arg0, (GtkWidget *)arg1);
@@ -6250,7 +6129,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1accel_1label_1set_1accel_1widget)
 
 #ifndef NO__1gtk_1adjustment_1changed
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1changed)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1changed_FUNC);
 	gtk_adjustment_changed((GtkAdjustment *)arg0);
@@ -6259,12 +6138,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1changed)
 #endif
 
 #ifndef NO__1gtk_1adjustment_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1adjustment_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1adjustment_1new)
 	(JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1new_FUNC);
-	rc = (jint)gtk_adjustment_new((gdouble)arg0, (gdouble)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, arg5);
+	rc = (jintLong)gtk_adjustment_new((gdouble)arg0, (gdouble)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, arg5);
 	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1new_FUNC);
 	return rc;
 }
@@ -6272,7 +6151,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1adjustment_1new)
 
 #ifndef NO__1gtk_1adjustment_1set_1value
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1set_1value)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1value_FUNC);
 	gtk_adjustment_set_value((GtkAdjustment *)arg0, (gdouble)arg1);
@@ -6282,7 +6161,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1set_1value)
 
 #ifndef NO__1gtk_1adjustment_1value_1changed
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1value_1changed)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1value_1changed_FUNC);
 	gtk_adjustment_value_changed((GtkAdjustment *)arg0);
@@ -6291,12 +6170,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1value_1changed)
 #endif
 
 #ifndef NO__1gtk_1arrow_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1arrow_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1arrow_1new)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1arrow_1new_FUNC);
-	rc = (jint)gtk_arrow_new((GtkArrowType)arg0, (GtkShadowType)arg1);
+	rc = (jintLong)gtk_arrow_new((GtkArrowType)arg0, (GtkShadowType)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1arrow_1new_FUNC);
 	return rc;
 }
@@ -6304,7 +6183,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1arrow_1new)
 
 #ifndef NO__1gtk_1arrow_1set
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1arrow_1set)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1arrow_1set_FUNC);
 	gtk_arrow_set((GtkArrow *)arg0, (GtkArrowType)arg1, (GtkShadowType)arg2);
@@ -6313,12 +6192,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1arrow_1set)
 #endif
 
 #ifndef NO__1gtk_1bin_1get_1child
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1bin_1get_1child)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1bin_1get_1child)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1bin_1get_1child_FUNC);
-	rc = (jint)gtk_bin_get_child((GtkBin *)arg0);
+	rc = (jintLong)gtk_bin_get_child((GtkBin *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1bin_1get_1child_FUNC);
 	return rc;
 }
@@ -6326,7 +6205,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1bin_1get_1child)
 
 #ifndef NO__1gtk_1box_1set_1child_1packing
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1child_1packing)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jboolean arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jboolean arg3, jint arg4, jint arg5)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1box_1set_1child_1packing_FUNC);
 	gtk_box_set_child_packing((GtkBox *)arg0, (GtkWidget *)arg1, arg2, arg3, arg4, arg5);
@@ -6336,7 +6215,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1child_1packing)
 
 #ifndef NO__1gtk_1box_1set_1spacing
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1spacing)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1box_1set_1spacing_FUNC);
 	gtk_box_set_spacing((GtkBox *)arg0, arg1);
@@ -6346,7 +6225,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1spacing)
 
 #ifndef NO__1gtk_1button_1clicked
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1clicked)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1button_1clicked_FUNC);
 	gtk_button_clicked((GtkButton *)arg0);
@@ -6356,7 +6235,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1clicked)
 
 #ifndef NO__1gtk_1button_1get_1relief
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1button_1get_1relief)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1button_1get_1relief_FUNC);
@@ -6367,12 +6246,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1button_1get_1relief)
 #endif
 
 #ifndef NO__1gtk_1button_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1button_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1button_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1button_1new_FUNC);
-	rc = (jint)gtk_button_new();
+	rc = (jintLong)gtk_button_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1button_1new_FUNC);
 	return rc;
 }
@@ -6380,7 +6259,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1button_1new)
 
 #ifndef NO__1gtk_1button_1set_1relief
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1set_1relief)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1button_1set_1relief_FUNC);
 	gtk_button_set_relief((GtkButton *)arg0, (GtkReliefStyle)arg1);
@@ -6390,24 +6269,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1set_1relief)
 
 #ifndef NO__1gtk_1calendar_1display_1options
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1display_1options)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1display_1options_FUNC);
 /*
 	gtk_calendar_display_options((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GtkCalendar *, GtkCalendarDisplayOptions);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_calendar_display_options_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_calendar_display_options");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
+		LOAD_FUNCTION(fp, gtk_calendar_display_options)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkCalendar *, GtkCalendarDisplayOptions))fp)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1display_1options_FUNC);
@@ -6416,7 +6287,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1display_1options)
 
 #ifndef NO__1gtk_1calendar_1get_1date
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1get_1date)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2, jintArray arg3)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -6429,17 +6300,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1get_1date)
 	gtk_calendar_get_date((GtkCalendar *)arg0, (guint *)lparg1, (guint *)lparg2, (guint *)lparg3);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GtkCalendar *, guint *, guint *, guint *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_calendar_get_date_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_calendar_get_date");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GtkCalendar *)arg0, (guint *)lparg1, (guint *)lparg2, (guint *)lparg3);
+		LOAD_FUNCTION(fp, gtk_calendar_get_date)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkCalendar *, guint *, guint *, guint *))fp)((GtkCalendar *)arg0, (guint *)lparg1, (guint *)lparg2, (guint *)lparg3);
 		}
 	}
 fail:
@@ -6451,27 +6314,18 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1calendar_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1calendar_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1calendar_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1new_FUNC);
 /*
-	rc = (jint)gtk_calendar_new();
+	rc = (jintLong)gtk_calendar_new();
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)();
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_calendar_new_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_calendar_new");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)();
+		LOAD_FUNCTION(fp, gtk_calendar_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1new_FUNC);
@@ -6481,24 +6335,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1calendar_1new)
 
 #ifndef NO__1gtk_1calendar_1select_1day
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1select_1day)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1select_1day_FUNC);
 /*
 	gtk_calendar_select_day((GtkCalendar *)arg0, (guint)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GtkCalendar *, guint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_calendar_select_day_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_calendar_select_day");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GtkCalendar *)arg0, (guint)arg1);
+		LOAD_FUNCTION(fp, gtk_calendar_select_day)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkCalendar *, guint))fp)((GtkCalendar *)arg0, (guint)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1select_1day_FUNC);
@@ -6507,7 +6353,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1select_1day)
 
 #ifndef NO__1gtk_1calendar_1select_1month
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1calendar_1select_1month)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1select_1month_FUNC);
@@ -6515,18 +6361,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1calendar_1select_1month)
 	rc = (jboolean)gtk_calendar_select_month((GtkCalendar *)arg0, (guint)arg1, (guint)arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(GtkCalendar *, guint, guint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_calendar_select_month_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_calendar_select_month");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)((GtkCalendar *)arg0, (guint)arg1, (guint)arg2);
+		LOAD_FUNCTION(fp, gtk_calendar_select_month)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkCalendar *, guint, guint))fp)((GtkCalendar *)arg0, (guint)arg1, (guint)arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1select_1month_FUNC);
@@ -6536,24 +6373,16 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1calendar_1select_1month)
 
 #ifndef NO__1gtk_1calendar_1set_1display_1options
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1set_1display_1options)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1set_1display_1options_FUNC);
 /*
 	gtk_calendar_set_display_options((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GtkCalendar *, GtkCalendarDisplayOptions);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_calendar_set_display_options_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_calendar_set_display_options");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
+		LOAD_FUNCTION(fp, gtk_calendar_set_display_options)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkCalendar *, GtkCalendarDisplayOptions))fp)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1set_1display_1options_FUNC);
@@ -6562,24 +6391,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1set_1display_1options)
 
 #ifndef NO__1gtk_1cell_1layout_1clear
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1clear)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1clear_FUNC);
 /*
 	gtk_cell_layout_clear(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_cell_layout_clear_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_cell_layout_clear");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_cell_layout_clear)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1clear_FUNC);
@@ -6588,24 +6409,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1clear)
 
 #ifndef NO__1gtk_1cell_1layout_1pack_1start
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1pack_1start)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1pack_1start_FUNC);
 /*
 	gtk_cell_layout_pack_start(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint, jboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_cell_layout_pack_start_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_cell_layout_pack_start");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, gtk_cell_layout_pack_start)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jboolean))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1pack_1start_FUNC);
@@ -6614,7 +6427,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1pack_1start)
 
 #ifndef NO__1gtk_1cell_1renderer_1get_1size
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1get_1size)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
 {
 	GdkRectangle _arg2, *lparg2=NULL;
 	jint *lparg3=NULL;
@@ -6639,48 +6452,48 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1cell_1renderer_1pixbuf_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1pixbuf_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1pixbuf_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1pixbuf_1new_FUNC);
-	rc = (jint)gtk_cell_renderer_pixbuf_new();
+	rc = (jintLong)gtk_cell_renderer_pixbuf_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1pixbuf_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1renderer_1text_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1text_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1text_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1text_1new_FUNC);
-	rc = (jint)gtk_cell_renderer_text_new();
+	rc = (jintLong)gtk_cell_renderer_text_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1text_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1renderer_1toggle_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1toggle_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1toggle_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1toggle_1new_FUNC);
-	rc = (jint)gtk_cell_renderer_toggle_new();
+	rc = (jintLong)gtk_cell_renderer_toggle_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1toggle_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1check_1button_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1button_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1check_1button_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1check_1button_1new_FUNC);
-	rc = (jint)gtk_check_button_new();
+	rc = (jintLong)gtk_check_button_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1check_1button_1new_FUNC);
 	return rc;
 }
@@ -6688,7 +6501,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1button_1new)
 
 #ifndef NO__1gtk_1check_1menu_1item_1get_1active
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1get_1active)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1get_1active_FUNC);
@@ -6699,14 +6512,14 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1get_1active)
 #endif
 
 #ifndef NO__1gtk_1check_1menu_1item_1new_1with_1label
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1new_1with_1label)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1new_1with_1label)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1new_1with_1label_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_check_menu_item_new_with_label((const gchar *)lparg0);
+	rc = (jintLong)gtk_check_menu_item_new_with_label((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1check_1menu_1item_1new_1with_1label_FUNC);
@@ -6716,7 +6529,7 @@ fail:
 
 #ifndef NO__1gtk_1check_1menu_1item_1set_1active
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1set_1active)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1set_1active_FUNC);
 	gtk_check_menu_item_set_active((GtkCheckMenuItem *)arg0, (gboolean)arg1);
@@ -6725,12 +6538,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1set_1active)
 #endif
 
 #ifndef NO__1gtk_1check_1version
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1version)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1check_1version)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1check_1version_FUNC);
-	rc = (jint)gtk_check_version(arg0, arg1, arg2);
+	rc = (jintLong)gtk_check_version(arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, _1gtk_1check_1version_FUNC);
 	return rc;
 }
@@ -6738,7 +6551,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1version)
 
 #ifndef NO__1gtk_1clipboard_1clear
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1clear)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1clear_FUNC);
 	gtk_clipboard_clear((GtkClipboard *)arg0);
@@ -6747,12 +6560,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1clear)
 #endif
 
 #ifndef NO__1gtk_1clipboard_1get
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1clipboard_1get)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1clipboard_1get)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1get_FUNC);
-	rc = (jint)gtk_clipboard_get((GdkAtom)arg0);
+	rc = (jintLong)gtk_clipboard_get((GdkAtom)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1get_FUNC);
 	return rc;
 }
@@ -6760,7 +6573,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1clipboard_1get)
 
 #ifndef NO__1gtk_1clipboard_1set_1with_1data
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1clipboard_1set_1with_1data)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1set_1with_1data_FUNC);
@@ -6771,26 +6584,26 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1clipboard_1set_1with_1data)
 #endif
 
 #ifndef NO__1gtk_1clipboard_1wait_1for_1contents
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1clipboard_1wait_1for_1contents)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1clipboard_1wait_1for_1contents)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1wait_1for_1contents_FUNC);
-	rc = (jint)gtk_clipboard_wait_for_contents((GtkClipboard *)arg0, (GdkAtom)arg1);
+	rc = (jintLong)gtk_clipboard_wait_for_contents((GtkClipboard *)arg0, (GdkAtom)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1wait_1for_1contents_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1color_1selection_1dialog_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1color_1selection_1dialog_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1color_1selection_1dialog_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1dialog_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_color_selection_dialog_new((const gchar *)lparg0);
+	rc = (jintLong)gtk_color_selection_dialog_new((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1dialog_1new_FUNC);
@@ -6800,7 +6613,7 @@ fail:
 
 #ifndef NO__1gtk_1color_1selection_1get_1current_1color
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1get_1current_1color)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkColor _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1get_1current_1color_FUNC);
@@ -6814,7 +6627,7 @@ fail:
 
 #ifndef NO__1gtk_1color_1selection_1set_1current_1color
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1set_1current_1color)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkColor _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1set_1current_1color_FUNC);
@@ -6827,7 +6640,7 @@ fail:
 
 #ifndef NO__1gtk_1color_1selection_1set_1has_1palette
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1set_1has_1palette)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1set_1has_1palette_FUNC);
 	gtk_color_selection_set_has_palette((GtkColorSelection *)arg0, arg1);
@@ -6836,27 +6649,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1set_1has_1palette)
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1entry_1new_1text
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1entry_1new_1text)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1entry_1new_1text)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1entry_1new_1text_FUNC);
 /*
-	rc = (jint)gtk_combo_box_entry_new_text();
+	rc = (jintLong)gtk_combo_box_entry_new_text();
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)();
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_combo_box_entry_new_text_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_entry_new_text");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)();
+		LOAD_FUNCTION(fp, gtk_combo_box_entry_new_text)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1entry_1new_1text_FUNC);
@@ -6866,7 +6670,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1entry_1new_1text)
 
 #ifndef NO__1gtk_1combo_1box_1get_1active
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1active)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1active_FUNC);
@@ -6874,18 +6678,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1active)
 	rc = (jint)gtk_combo_box_get_active(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_combo_box_get_active_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_get_active");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_combo_box_get_active)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1get_1active_FUNC);
@@ -6894,27 +6689,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1active)
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1get_1model
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1model)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1model)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1model_FUNC);
 /*
-	rc = (jint)gtk_combo_box_get_model(arg0);
+	rc = (jintLong)gtk_combo_box_get_model(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_combo_box_get_model_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_get_model");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_combo_box_get_model)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1get_1model_FUNC);
@@ -6924,7 +6710,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1model)
 
 #ifndef NO__1gtk_1combo_1box_1insert_1text
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1insert_1text)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2)
 {
 	jbyte *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1insert_1text_FUNC);
@@ -6933,17 +6719,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1insert_1text)
 	gtk_combo_box_insert_text(arg0, arg1, lparg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint, jbyte *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_combo_box_insert_text_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_insert_text");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, lparg2);
+		LOAD_FUNCTION(fp, gtk_combo_box_insert_text)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jint, jbyte *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
@@ -6953,27 +6731,18 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1new_1text
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1new_1text)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1new_1text)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1new_1text_FUNC);
 /*
-	rc = (jint)gtk_combo_box_new_text();
+	rc = (jintLong)gtk_combo_box_new_text();
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)();
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_combo_box_new_text_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_new_text");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)();
+		LOAD_FUNCTION(fp, gtk_combo_box_new_text)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1new_1text_FUNC);
@@ -6983,24 +6752,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1new_1text)
 
 #ifndef NO__1gtk_1combo_1box_1popdown
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popdown)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1popdown_FUNC);
 /*
 	gtk_combo_box_popdown(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_combo_box_popdown_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_popdown");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_combo_box_popdown)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1popdown_FUNC);
@@ -7009,24 +6770,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popdown)
 
 #ifndef NO__1gtk_1combo_1box_1popup
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popup)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1popup_FUNC);
 /*
 	gtk_combo_box_popup(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_combo_box_popup_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_popup");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_combo_box_popup)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1popup_FUNC);
@@ -7035,24 +6788,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popup)
 
 #ifndef NO__1gtk_1combo_1box_1remove_1text
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1remove_1text)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1remove_1text_FUNC);
 /*
 	gtk_combo_box_remove_text(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_combo_box_remove_text_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_remove_text");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_combo_box_remove_text)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1remove_1text_FUNC);
@@ -7061,24 +6806,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1remove_1text)
 
 #ifndef NO__1gtk_1combo_1box_1set_1active
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1active)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1active_FUNC);
 /*
 	gtk_combo_box_set_active(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_combo_box_set_active_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_set_active");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_combo_box_set_active)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1active_FUNC);
@@ -7087,24 +6824,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1active)
 
 #ifndef NO__1gtk_1combo_1box_1set_1focus_1on_1click
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1focus_1on_1click_FUNC);
 /*
 	gtk_combo_box_set_focus_on_click(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_combo_box_set_focus_on_click_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_set_focus_on_click");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_combo_box_set_focus_on_click)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1focus_1on_1click_FUNC);
@@ -7113,7 +6842,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click)
 
 #ifndef NO__1gtk_1combo_1disable_1activate
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1disable_1activate)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1disable_1activate_FUNC);
 	gtk_combo_disable_activate((GtkCombo *)arg0);
@@ -7122,12 +6851,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1disable_1activate)
 #endif
 
 #ifndef NO__1gtk_1combo_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1new_FUNC);
-	rc = (jint)gtk_combo_new();
+	rc = (jintLong)gtk_combo_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1new_FUNC);
 	return rc;
 }
@@ -7135,7 +6864,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1new)
 
 #ifndef NO__1gtk_1combo_1set_1case_1sensitive
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1set_1case_1sensitive)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1set_1case_1sensitive_FUNC);
 	gtk_combo_set_case_sensitive((GtkCombo *)arg0, (gboolean)arg1);
@@ -7145,7 +6874,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1set_1case_1sensitive)
 
 #ifndef NO__1gtk_1combo_1set_1popdown_1strings
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1set_1popdown_1strings)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1set_1popdown_1strings_FUNC);
 	gtk_combo_set_popdown_strings((GtkCombo *)arg0, (GList *)arg1);
@@ -7155,7 +6884,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1set_1popdown_1strings)
 
 #ifndef NO__1gtk_1container_1add
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1add)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1container_1add_FUNC);
 	gtk_container_add((GtkContainer *)arg0, (GtkWidget *)arg1);
@@ -7165,7 +6894,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1add)
 
 #ifndef NO__1gtk_1container_1forall
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1forall)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1container_1forall_FUNC);
 	gtk_container_forall((GtkContainer *)arg0, (GtkCallback)arg1, (gpointer)arg2);
@@ -7175,7 +6904,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1forall)
 
 #ifndef NO__1gtk_1container_1get_1border_1width
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1container_1get_1border_1width)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1container_1get_1border_1width_FUNC);
@@ -7186,12 +6915,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1container_1get_1border_1width)
 #endif
 
 #ifndef NO__1gtk_1container_1get_1children
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1container_1get_1children)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1container_1get_1children)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1container_1get_1children_FUNC);
-	rc = (jint)gtk_container_get_children((GtkContainer *)arg0);
+	rc = (jintLong)gtk_container_get_children((GtkContainer *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1container_1get_1children_FUNC);
 	return rc;
 }
@@ -7199,7 +6928,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1container_1get_1children)
 
 #ifndef NO__1gtk_1container_1remove
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1remove)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1container_1remove_FUNC);
 	gtk_container_remove((GtkContainer *)arg0, (GtkWidget *)arg1);
@@ -7209,7 +6938,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1remove)
 
 #ifndef NO__1gtk_1container_1resize_1children
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1resize_1children)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1container_1resize_1children_FUNC);
 	gtk_container_resize_children((GtkContainer *)arg0);
@@ -7219,7 +6948,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1resize_1children)
 
 #ifndef NO__1gtk_1container_1set_1border_1width
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1set_1border_1width)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1container_1set_1border_1width_FUNC);
 	gtk_container_set_border_width((GtkContainer *)arg0, (guint)arg1);
@@ -7228,14 +6957,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1set_1border_1width)
 #endif
 
 #ifndef NO__1gtk_1dialog_1add_1button
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1dialog_1add_1button)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1dialog_1add_1button)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1dialog_1add_1button_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_dialog_add_button((GtkDialog *)arg0, (const gchar *)lparg1, (gint)arg2);
+	rc = (jintLong)gtk_dialog_add_button((GtkDialog *)arg0, (const gchar *)lparg1, (gint)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1dialog_1add_1button_FUNC);
@@ -7245,7 +6974,7 @@ fail:
 
 #ifndef NO__1gtk_1dialog_1run
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1dialog_1run)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1dialog_1run_FUNC);
@@ -7256,12 +6985,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1dialog_1run)
 #endif
 
 #ifndef NO__1gtk_1drag_1begin
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drag_1begin)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1drag_1begin)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1begin_FUNC);
-	rc = (jint)gtk_drag_begin((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4);
+	rc = (jintLong)gtk_drag_begin((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4);
 	OS_NATIVE_EXIT(env, that, _1gtk_1drag_1begin_FUNC);
 	return rc;
 }
@@ -7269,7 +6998,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drag_1begin)
 
 #ifndef NO__1gtk_1drag_1check_1threshold
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1drag_1check_1threshold)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1check_1threshold_FUNC);
@@ -7280,12 +7009,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1drag_1check_1threshold)
 #endif
 
 #ifndef NO__1gtk_1drag_1dest_1find_1target
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drag_1dest_1find_1target)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1drag_1dest_1find_1target)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1find_1target_FUNC);
-	rc = (jint)gtk_drag_dest_find_target((GtkWidget *)arg0, (GdkDragContext *)arg1, (GtkTargetList *)arg2);
+	rc = (jintLong)gtk_drag_dest_find_target((GtkWidget *)arg0, (GdkDragContext *)arg1, (GtkTargetList *)arg2);
 	OS_NATIVE_EXIT(env, that, _1gtk_1drag_1dest_1find_1target_FUNC);
 	return rc;
 }
@@ -7293,7 +7022,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drag_1dest_1find_1target)
 
 #ifndef NO__1gtk_1drag_1dest_1set
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1dest_1set)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3, jint arg4)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1set_FUNC);
 	gtk_drag_dest_set((GtkWidget *)arg0, (GtkDestDefaults)arg1, (const GtkTargetEntry *)arg2, (gint)arg3, (GdkDragAction)arg4);
@@ -7303,7 +7032,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1dest_1set)
 
 #ifndef NO__1gtk_1drag_1dest_1unset
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1dest_1unset)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1unset_FUNC);
 	gtk_drag_dest_unset((GtkWidget *)arg0);
@@ -7313,7 +7042,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1dest_1unset)
 
 #ifndef NO__1gtk_1drag_1finish
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1finish)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jboolean arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jboolean arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1finish_FUNC);
 	gtk_drag_finish((GdkDragContext *)arg0, (gboolean)arg1, (gboolean)arg2, (guint32)arg3);
@@ -7323,7 +7052,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1finish)
 
 #ifndef NO__1gtk_1drag_1get_1data
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1get_1data)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1get_1data_FUNC);
 	gtk_drag_get_data((GtkWidget *)arg0, (GdkDragContext *)arg1, (GdkAtom)arg2, (guint32)arg3);
@@ -7333,7 +7062,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1get_1data)
 
 #ifndef NO__1gtk_1drag_1set_1icon_1pixbuf
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1set_1icon_1pixbuf)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1set_1icon_1pixbuf_FUNC);
 	gtk_drag_set_icon_pixbuf((GdkDragContext *)arg0, (GdkPixbuf *)arg1, arg2, arg3);
@@ -7342,12 +7071,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1set_1icon_1pixbuf)
 #endif
 
 #ifndef NO__1gtk_1drawing_1area_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drawing_1area_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1drawing_1area_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1drawing_1area_1new_FUNC);
-	rc = (jint)gtk_drawing_area_new();
+	rc = (jintLong)gtk_drawing_area_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1drawing_1area_1new_FUNC);
 	return rc;
 }
@@ -7355,7 +7084,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drawing_1area_1new)
 
 #ifndef NO__1gtk_1editable_1copy_1clipboard
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1copy_1clipboard)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1copy_1clipboard_FUNC);
 	gtk_editable_copy_clipboard((GtkEditable *)arg0);
@@ -7365,7 +7094,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1copy_1clipboard)
 
 #ifndef NO__1gtk_1editable_1cut_1clipboard
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1cut_1clipboard)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1cut_1clipboard_FUNC);
 	gtk_editable_cut_clipboard((GtkEditable *)arg0);
@@ -7375,7 +7104,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1cut_1clipboard)
 
 #ifndef NO__1gtk_1editable_1delete_1selection
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1selection)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1delete_1selection_FUNC);
 	gtk_editable_delete_selection((GtkEditable *)arg0);
@@ -7385,7 +7114,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1selection)
 
 #ifndef NO__1gtk_1editable_1delete_1text
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1text)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1delete_1text_FUNC);
 	gtk_editable_delete_text((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
@@ -7394,12 +7123,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1text)
 #endif
 
 #ifndef NO__1gtk_1editable_1get_1chars
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1editable_1get_1chars)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1editable_1get_1chars)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1chars_FUNC);
-	rc = (jint)gtk_editable_get_chars((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
+	rc = (jintLong)gtk_editable_get_chars((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
 	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1get_1chars_FUNC);
 	return rc;
 }
@@ -7407,7 +7136,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1editable_1get_1chars)
 
 #ifndef NO__1gtk_1editable_1get_1editable
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1editable_1get_1editable)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1editable_FUNC);
@@ -7419,7 +7148,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1editable_1get_1editable)
 
 #ifndef NO__1gtk_1editable_1get_1position
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1editable_1get_1position)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1position_FUNC);
@@ -7431,7 +7160,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1editable_1get_1position)
 
 #ifndef NO__1gtk_1editable_1get_1selection_1bounds
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1editable_1get_1selection_1bounds)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -7450,7 +7179,7 @@ fail:
 
 #ifndef NO__1gtk_1editable_1insert_1text
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1insert_1text)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintArray arg3)
 {
 	jbyte *lparg1=NULL;
 	jint *lparg3=NULL;
@@ -7467,7 +7196,7 @@ fail:
 
 #ifndef NO__1gtk_1editable_1paste_1clipboard
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1paste_1clipboard)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1paste_1clipboard_FUNC);
 	gtk_editable_paste_clipboard((GtkEditable *)arg0);
@@ -7477,7 +7206,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1paste_1clipboard)
 
 #ifndef NO__1gtk_1editable_1select_1region
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1select_1region)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1select_1region_FUNC);
 	gtk_editable_select_region((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
@@ -7487,7 +7216,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1select_1region)
 
 #ifndef NO__1gtk_1editable_1set_1editable
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1set_1editable)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1set_1editable_FUNC);
 	gtk_editable_set_editable((GtkEditable *)arg0, (gboolean)arg1);
@@ -7497,7 +7226,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1set_1editable)
 
 #ifndef NO__1gtk_1editable_1set_1position
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1set_1position)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1set_1position_FUNC);
 	gtk_editable_set_position((GtkEditable *)arg0, (gint)arg1);
@@ -7507,7 +7236,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1set_1position)
 
 #ifndef NO__1gtk_1entry_1get_1invisible_1char
 JNIEXPORT jchar JNICALL OS_NATIVE(_1gtk_1entry_1get_1invisible_1char)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jchar rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1invisible_1char_FUNC);
@@ -7518,12 +7247,12 @@ JNIEXPORT jchar JNICALL OS_NATIVE(_1gtk_1entry_1get_1invisible_1char)
 #endif
 
 #ifndef NO__1gtk_1entry_1get_1layout
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1layout_FUNC);
-	rc = (jint)gtk_entry_get_layout((GtkEntry *)arg0);
+	rc = (jintLong)gtk_entry_get_layout((GtkEntry *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1layout_FUNC);
 	return rc;
 }
@@ -7531,7 +7260,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout)
 
 #ifndef NO__1gtk_1entry_1get_1layout_1offsets
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout_1offsets)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -7548,7 +7277,7 @@ fail:
 
 #ifndef NO__1gtk_1entry_1get_1max_1length
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1max_1length)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1max_1length_FUNC);
@@ -7559,12 +7288,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1max_1length)
 #endif
 
 #ifndef NO__1gtk_1entry_1get_1text
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1text)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1get_1text)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1text_FUNC);
-	rc = (jint)gtk_entry_get_text((GtkEntry *)arg0);
+	rc = (jintLong)gtk_entry_get_text((GtkEntry *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1text_FUNC);
 	return rc;
 }
@@ -7572,7 +7301,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1text)
 
 #ifndef NO__1gtk_1entry_1get_1visibility
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1entry_1get_1visibility)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1visibility_FUNC);
@@ -7583,12 +7312,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1entry_1get_1visibility)
 #endif
 
 #ifndef NO__1gtk_1entry_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1new_FUNC);
-	rc = (jint)gtk_entry_new();
+	rc = (jintLong)gtk_entry_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1new_FUNC);
 	return rc;
 }
@@ -7596,7 +7325,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1new)
 
 #ifndef NO__1gtk_1entry_1set_1activates_1default
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1activates_1default)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1activates_1default_FUNC);
 	gtk_entry_set_activates_default((GtkEntry *)arg0, (gboolean)arg1);
@@ -7606,24 +7335,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1activates_1default)
 
 #ifndef NO__1gtk_1entry_1set_1alignment
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1alignment)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1alignment_FUNC);
 /*
 	gtk_entry_set_alignment((GtkEntry *)arg0, (gfloat)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GtkEntry *, gfloat);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_entry_set_alignment_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_entry_set_alignment");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GtkEntry *)arg0, (gfloat)arg1);
+		LOAD_FUNCTION(fp, gtk_entry_set_alignment)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkEntry *, gfloat))fp)((GtkEntry *)arg0, (gfloat)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1alignment_FUNC);
@@ -7632,7 +7353,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1alignment)
 
 #ifndef NO__1gtk_1entry_1set_1has_1frame
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1has_1frame)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1has_1frame_FUNC);
 	gtk_entry_set_has_frame((GtkEntry *)arg0, (gboolean)arg1);
@@ -7642,7 +7363,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1has_1frame)
 
 #ifndef NO__1gtk_1entry_1set_1invisible_1char
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1invisible_1char)
-	(JNIEnv *env, jclass that, jint arg0, jchar arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jchar arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1invisible_1char_FUNC);
 	gtk_entry_set_invisible_char((GtkEntry *)arg0, (gint)arg1);
@@ -7652,7 +7373,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1invisible_1char)
 
 #ifndef NO__1gtk_1entry_1set_1max_1length
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1max_1length)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1max_1length_FUNC);
 	gtk_entry_set_max_length((GtkEntry *)arg0, (gint)arg1);
@@ -7662,7 +7383,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1max_1length)
 
 #ifndef NO__1gtk_1entry_1set_1text
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1text)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1text_FUNC);
@@ -7676,7 +7397,7 @@ fail:
 
 #ifndef NO__1gtk_1entry_1set_1visibility
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1visibility)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1visibility_FUNC);
 	gtk_entry_set_visibility((GtkEntry *)arg0, (gboolean)arg1);
@@ -7686,7 +7407,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1visibility)
 
 #ifndef NO__1gtk_1entry_1text_1index_1to_1layout_1index
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1text_1index_1to_1layout_1index_FUNC);
@@ -7694,18 +7415,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index)
 	rc = (jint)gtk_entry_text_index_to_layout_index(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_entry_text_index_to_layout_index_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_entry_text_index_to_layout_index");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_entry_text_index_to_layout_index)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1text_1index_1to_1layout_1index_FUNC);
@@ -7715,24 +7427,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index)
 
 #ifndef NO__1gtk_1enumerate_1printers
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1enumerate_1printers)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1enumerate_1printers_FUNC);
 /*
 	gtk_enumerate_printers(arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, gpointer, GDestroyNotify, gboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_enumerate_printers_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_enumerate_printers");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3);
+		LOAD_FUNCTION(fp, gtk_enumerate_printers)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, gpointer, GDestroyNotify, gboolean))fp)(arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1enumerate_1printers_FUNC);
@@ -7753,7 +7457,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1events_1pending)
 
 #ifndef NO__1gtk_1expander_1get_1expanded
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1expander_1get_1expanded_FUNC);
@@ -7761,18 +7465,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded)
 	rc = (jboolean)gtk_expander_get_expanded(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_expander_get_expanded_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_expander_get_expanded");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_expander_get_expanded)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1expander_1get_1expanded_FUNC);
@@ -7781,27 +7476,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded)
 #endif
 
 #ifndef NO__1gtk_1expander_1get_1label_1widget
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1expander_1get_1label_1widget)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1expander_1get_1label_1widget)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1expander_1get_1label_1widget_FUNC);
 /*
-	rc = (jint)gtk_expander_get_label_widget(arg0);
+	rc = (jintLong)gtk_expander_get_label_widget(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_expander_get_label_widget_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_expander_get_label_widget");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_expander_get_label_widget)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1expander_1get_1label_1widget_FUNC);
@@ -7810,29 +7496,20 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1expander_1get_1label_1widget)
 #endif
 
 #ifndef NO__1gtk_1expander_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1expander_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1expander_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1expander_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)gtk_expander_new((const gchar *)lparg0);
+	rc = (jintLong)gtk_expander_new((const gchar *)lparg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(const gchar *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_expander_new_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_expander_new");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((const gchar *)lparg0);
+		LOAD_FUNCTION(fp, gtk_expander_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0);
 		}
 	}
 fail:
@@ -7844,24 +7521,16 @@ fail:
 
 #ifndef NO__1gtk_1expander_1set_1expanded
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1expanded)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1expanded_FUNC);
 /*
 	gtk_expander_set_expanded(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_expander_set_expanded_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_expander_set_expanded");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_expander_set_expanded)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1expander_1set_1expanded_FUNC);
@@ -7870,7 +7539,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1expanded)
 
 #ifndef NO__1gtk_1expander_1set_1label
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1label_FUNC);
@@ -7879,17 +7548,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label)
 	gtk_expander_set_label(arg0, (const gchar *)lparg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, const gchar *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_expander_set_label_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_expander_set_label");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, (const gchar *)lparg1);
+		LOAD_FUNCTION(fp, gtk_expander_set_label)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, const gchar *))fp)(arg0, (const gchar *)lparg1);
 		}
 	}
 fail:
@@ -7900,24 +7561,16 @@ fail:
 
 #ifndef NO__1gtk_1expander_1set_1label_1widget
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label_1widget)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1label_1widget_FUNC);
 /*
 	gtk_expander_set_label_widget(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_expander_set_label_widget_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_expander_set_label_widget");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_expander_set_label_widget)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1expander_1set_1label_1widget_FUNC);
@@ -7926,24 +7579,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label_1widget)
 
 #ifndef NO__1gtk_1file_1chooser_1add_1filter
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1add_1filter)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1add_1filter_FUNC);
 /*
 	gtk_file_chooser_add_filter(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_chooser_add_filter_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_add_filter");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_file_chooser_add_filter)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1add_1filter_FUNC);
@@ -7951,27 +7596,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1add_1filter)
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1get_1current_1folder
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1current_1folder)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1current_1folder)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1current_1folder_FUNC);
 /*
-	rc = (jint)gtk_file_chooser_get_current_folder(arg0);
+	rc = (jintLong)gtk_file_chooser_get_current_folder(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_chooser_get_current_folder_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_get_current_folder");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_file_chooser_get_current_folder)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1current_1folder_FUNC);
@@ -7980,27 +7616,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1current_1folder)
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1get_1filename
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filename)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filename)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filename_FUNC);
 /*
-	rc = (jint)gtk_file_chooser_get_filename(arg0);
+	rc = (jintLong)gtk_file_chooser_get_filename(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_chooser_get_filename_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_get_filename");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_file_chooser_get_filename)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filename_FUNC);
@@ -8009,27 +7636,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filename)
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1get_1filenames
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filenames)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filenames)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filenames_FUNC);
 /*
-	rc = (jint)gtk_file_chooser_get_filenames(arg0);
+	rc = (jintLong)gtk_file_chooser_get_filenames(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_chooser_get_filenames_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_get_filenames");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_file_chooser_get_filenames)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filenames_FUNC);
@@ -8038,27 +7656,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filenames)
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1get_1filter
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filter)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filter)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filter_FUNC);
 /*
-	rc = (jint)gtk_file_chooser_get_filter(arg0);
+	rc = (jintLong)gtk_file_chooser_get_filter(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_chooser_get_filter_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_get_filter");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_file_chooser_get_filter)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filter_FUNC);
@@ -8068,24 +7677,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filter)
 
 #ifndef NO__1gtk_1file_1chooser_1set_1current_1folder
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1folder_FUNC);
 /*
 	gtk_file_chooser_set_current_folder(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_chooser_set_current_folder_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_current_folder");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_file_chooser_set_current_folder)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1current_1folder_FUNC);
@@ -8094,7 +7695,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder)
 
 #ifndef NO__1gtk_1file_1chooser_1set_1current_1name
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1name)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1name_FUNC);
@@ -8103,17 +7704,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1name)
 	gtk_file_chooser_set_current_name(arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jbyte *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_chooser_set_current_name_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_current_name");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, lparg1);
+		LOAD_FUNCTION(fp, gtk_file_chooser_set_current_name)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -8124,24 +7717,16 @@ fail:
 
 #ifndef NO__1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation_FUNC);
 /*
 	gtk_file_chooser_set_do_overwrite_confirmation(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_chooser_set_do_overwrite_confirmation_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_do_overwrite_confirmation");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_file_chooser_set_do_overwrite_confirmation)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation_FUNC);
@@ -8150,24 +7735,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1do_1overwrite_1confi
 
 #ifndef NO__1gtk_1file_1chooser_1set_1extra_1widget
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1extra_1widget)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1extra_1widget_FUNC);
 /*
 	gtk_file_chooser_set_extra_widget(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_chooser_set_extra_widget_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_extra_widget");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_file_chooser_set_extra_widget)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1extra_1widget_FUNC);
@@ -8176,24 +7753,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1extra_1widget)
 
 #ifndef NO__1gtk_1file_1chooser_1set_1filename
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filename)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1filename_FUNC);
 /*
 	gtk_file_chooser_set_filename(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_chooser_set_filename_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_filename");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_file_chooser_set_filename)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1filename_FUNC);
@@ -8202,24 +7771,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filename)
 
 #ifndef NO__1gtk_1file_1chooser_1set_1filter
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filter)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1filter_FUNC);
 /*
 	gtk_file_chooser_set_filter(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_chooser_set_filter_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_filter");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_file_chooser_set_filter)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1filter_FUNC);
@@ -8228,24 +7789,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filter)
 
 #ifndef NO__1gtk_1file_1chooser_1set_1select_1multiple
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1select_1multiple)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1select_1multiple_FUNC);
 /*
 	gtk_file_chooser_set_select_multiple(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_chooser_set_select_multiple_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_select_multiple");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_file_chooser_set_select_multiple)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1select_1multiple_FUNC);
@@ -8254,7 +7807,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1select_1multiple)
 
 #ifndef NO__1gtk_1file_1filter_1add_1pattern
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1add_1pattern)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1add_1pattern_FUNC);
@@ -8263,17 +7816,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1add_1pattern)
 	gtk_file_filter_add_pattern(arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jbyte *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_filter_add_pattern_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_filter_add_pattern");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, lparg1);
+		LOAD_FUNCTION(fp, gtk_file_filter_add_pattern)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -8283,27 +7828,18 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1file_1filter_1get_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1filter_1get_1name)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1filter_1get_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1get_1name_FUNC);
 /*
-	rc = (jint)gtk_file_filter_get_name(arg0);
+	rc = (jintLong)gtk_file_filter_get_name(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_filter_get_name_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_filter_get_name");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_file_filter_get_name)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1get_1name_FUNC);
@@ -8312,27 +7848,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1filter_1get_1name)
 #endif
 
 #ifndef NO__1gtk_1file_1filter_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1filter_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1filter_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1new_FUNC);
 /*
-	rc = (jint)gtk_file_filter_new();
+	rc = (jintLong)gtk_file_filter_new();
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)();
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_filter_new_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_filter_new");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)();
+		LOAD_FUNCTION(fp, gtk_file_filter_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1new_FUNC);
@@ -8342,7 +7869,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1filter_1new)
 
 #ifndef NO__1gtk_1file_1filter_1set_1name
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1set_1name)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1set_1name_FUNC);
@@ -8351,17 +7878,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1set_1name)
 	gtk_file_filter_set_name(arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jbyte *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_file_filter_set_name_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_filter_set_name");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, lparg1);
+		LOAD_FUNCTION(fp, gtk_file_filter_set_name)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -8371,24 +7890,24 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1file_1selection_1get_1filename
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1filename)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1filename)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1get_1filename_FUNC);
-	rc = (jint)gtk_file_selection_get_filename((GtkFileSelection *)arg0);
+	rc = (jintLong)gtk_file_selection_get_filename((GtkFileSelection *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1selection_1get_1filename_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1file_1selection_1get_1selections
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1selections)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1selections)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1get_1selections_FUNC);
-	rc = (jint)gtk_file_selection_get_selections((GtkFileSelection *)arg0);
+	rc = (jintLong)gtk_file_selection_get_selections((GtkFileSelection *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1selection_1get_1selections_FUNC);
 	return rc;
 }
@@ -8396,7 +7915,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1selections)
 
 #ifndef NO__1gtk_1file_1selection_1hide_1fileop_1buttons
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1hide_1fileop_1buttons)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1hide_1fileop_1buttons_FUNC);
 	gtk_file_selection_hide_fileop_buttons((GtkFileSelection *)arg0);
@@ -8405,14 +7924,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1hide_1fileop_1buttons)
 #endif
 
 #ifndef NO__1gtk_1file_1selection_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1selection_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1selection_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_file_selection_new((const gchar *)lparg0);
+	rc = (jintLong)gtk_file_selection_new((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1file_1selection_1new_FUNC);
@@ -8422,7 +7941,7 @@ fail:
 
 #ifndef NO__1gtk_1file_1selection_1set_1filename
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1set_1filename)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1set_1filename_FUNC);
 	gtk_file_selection_set_filename((GtkFileSelection *)arg0, (const gchar *)arg1);
@@ -8432,7 +7951,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1set_1filename)
 
 #ifndef NO__1gtk_1file_1selection_1set_1select_1multiple
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1set_1select_1multiple)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1set_1select_1multiple_FUNC);
 	gtk_file_selection_set_select_multiple((GtkFileSelection *)arg0, (gboolean)arg1);
@@ -8442,7 +7961,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1set_1select_1multiple)
 
 #ifndef NO__1gtk_1fixed_1move
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1fixed_1move)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1fixed_1move_FUNC);
 	gtk_fixed_move((GtkFixed *)arg0, (GtkWidget *)arg1, (gint)arg2, (gint)arg3);
@@ -8451,12 +7970,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1fixed_1move)
 #endif
 
 #ifndef NO__1gtk_1fixed_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1fixed_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1fixed_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1fixed_1new_FUNC);
-	rc = (jint)gtk_fixed_new();
+	rc = (jintLong)gtk_fixed_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1fixed_1new_FUNC);
 	return rc;
 }
@@ -8464,7 +7983,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1fixed_1new)
 
 #ifndef NO__1gtk_1fixed_1set_1has_1window
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1fixed_1set_1has_1window)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1fixed_1set_1has_1window_FUNC);
 	gtk_fixed_set_has_window((GtkFixed *)arg0, (gboolean)arg1);
@@ -8473,26 +7992,26 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1fixed_1set_1has_1window)
 #endif
 
 #ifndef NO__1gtk_1font_1selection_1dialog_1get_1font_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1get_1font_1name)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1get_1font_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1font_1selection_1dialog_1get_1font_1name_FUNC);
-	rc = (jint)gtk_font_selection_dialog_get_font_name((GtkFontSelectionDialog *)arg0);
+	rc = (jintLong)gtk_font_selection_dialog_get_font_name((GtkFontSelectionDialog *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1font_1selection_1dialog_1get_1font_1name_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1font_1selection_1dialog_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1font_1selection_1dialog_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_font_selection_dialog_new((const gchar *)lparg0);
+	rc = (jintLong)gtk_font_selection_dialog_new((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1font_1selection_1dialog_1new_FUNC);
@@ -8502,7 +8021,7 @@ fail:
 
 #ifndef NO__1gtk_1font_1selection_1dialog_1set_1font_1name
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1set_1font_1name)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	jboolean rc = 0;
@@ -8517,26 +8036,26 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1frame_1get_1label_1widget
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1frame_1get_1label_1widget)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1frame_1get_1label_1widget)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1frame_1get_1label_1widget_FUNC);
-	rc = (jint)gtk_frame_get_label_widget((GtkFrame *)arg0);
+	rc = (jintLong)gtk_frame_get_label_widget((GtkFrame *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1frame_1get_1label_1widget_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1frame_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1frame_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1frame_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1frame_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_frame_new((const gchar *)lparg0);
+	rc = (jintLong)gtk_frame_new((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1frame_1new_FUNC);
@@ -8546,7 +8065,7 @@ fail:
 
 #ifndef NO__1gtk_1frame_1set_1label
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1label)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1label_FUNC);
@@ -8560,7 +8079,7 @@ fail:
 
 #ifndef NO__1gtk_1frame_1set_1label_1widget
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1label_1widget)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1label_1widget_FUNC);
 	gtk_frame_set_label_widget((GtkFrame *)arg0, (GtkWidget *)arg1);
@@ -8570,7 +8089,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1label_1widget)
 
 #ifndef NO__1gtk_1frame_1set_1shadow_1type
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1shadow_1type)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1shadow_1type_FUNC);
 	gtk_frame_set_shadow_type((GtkFrame *)arg0, (GtkShadowType)arg1);
@@ -8579,12 +8098,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1shadow_1type)
 #endif
 
 #ifndef NO__1gtk_1get_1current_1event
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1current_1event)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1get_1current_1event)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1get_1current_1event_FUNC);
-	rc = (jint)gtk_get_current_event();
+	rc = (jintLong)gtk_get_current_event();
 	OS_NATIVE_EXIT(env, that, _1gtk_1get_1current_1event_FUNC);
 	return rc;
 }
@@ -8619,24 +8138,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1current_1event_1time)
 #endif
 
 #ifndef NO__1gtk_1get_1default_1language
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1default_1language)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1get_1default_1language)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1get_1default_1language_FUNC);
-	rc = (jint)gtk_get_default_language();
+	rc = (jintLong)gtk_get_default_language();
 	OS_NATIVE_EXIT(env, that, _1gtk_1get_1default_1language_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1get_1event_1widget
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1event_1widget)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1get_1event_1widget)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1get_1event_1widget_FUNC);
-	rc = (jint)gtk_get_event_widget((GdkEvent *)arg0);
+	rc = (jintLong)gtk_get_event_widget((GdkEvent *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1get_1event_1widget_FUNC);
 	return rc;
 }
@@ -8644,7 +8163,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1event_1widget)
 
 #ifndef NO__1gtk_1grab_1add
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1add)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1grab_1add_FUNC);
 	gtk_grab_add((GtkWidget *)arg0);
@@ -8653,12 +8172,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1add)
 #endif
 
 #ifndef NO__1gtk_1grab_1get_1current
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1grab_1get_1current)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1grab_1get_1current)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1grab_1get_1current_FUNC);
-	rc = (jint)gtk_grab_get_current();
+	rc = (jintLong)gtk_grab_get_current();
 	OS_NATIVE_EXIT(env, that, _1gtk_1grab_1get_1current_FUNC);
 	return rc;
 }
@@ -8666,7 +8185,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1grab_1get_1current)
 
 #ifndef NO__1gtk_1grab_1remove
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1remove)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1grab_1remove_FUNC);
 	gtk_grab_remove((GtkWidget *)arg0);
@@ -8675,62 +8194,62 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1remove)
 #endif
 
 #ifndef NO__1gtk_1hbox_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1hbox_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hbox_1new)
 	(JNIEnv *env, jclass that, jboolean arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1hbox_1new_FUNC);
-	rc = (jint)gtk_hbox_new((gboolean)arg0, (gint)arg1);
+	rc = (jintLong)gtk_hbox_new((gboolean)arg0, (gint)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1hbox_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1hscale_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1hscale_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hscale_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1hscale_1new_FUNC);
-	rc = (jint)gtk_hscale_new((GtkAdjustment *)arg0);
+	rc = (jintLong)gtk_hscale_new((GtkAdjustment *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1hscale_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1hscrollbar_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1hscrollbar_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hscrollbar_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1hscrollbar_1new_FUNC);
-	rc = (jint)gtk_hscrollbar_new((GtkAdjustment *)arg0);
+	rc = (jintLong)gtk_hscrollbar_new((GtkAdjustment *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1hscrollbar_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1hseparator_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1hseparator_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hseparator_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1hseparator_1new_FUNC);
-	rc = (jint)gtk_hseparator_new();
+	rc = (jintLong)gtk_hseparator_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1hseparator_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1icon_1factory_1lookup_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1factory_1lookup_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1factory_1lookup_1default)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1factory_1lookup_1default_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_icon_factory_lookup_default((const gchar *)lparg0);
+	rc = (jintLong)gtk_icon_factory_lookup_default((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1icon_1factory_1lookup_1default_FUNC);
@@ -8739,12 +8258,12 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1icon_1set_1render_1icon
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1set_1render_1icon)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1set_1render_1icon)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jintLong arg6)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1set_1render_1icon_FUNC);
-	rc = (jint)gtk_icon_set_render_icon((GtkIconSet *)arg0, (GtkStyle *)arg1, (GtkTextDirection)arg2, (GtkStateType)arg3, (GtkIconSize)arg4, (GtkWidget *)arg5, (const char *)arg6);
+	rc = (jintLong)gtk_icon_set_render_icon((GtkIconSet *)arg0, (GtkStyle *)arg1, (GtkTextDirection)arg2, (GtkStateType)arg3, (GtkIconSize)arg4, (GtkWidget *)arg5, (const char *)arg6);
 	OS_NATIVE_EXIT(env, that, _1gtk_1icon_1set_1render_1icon_FUNC);
 	return rc;
 }
@@ -8752,7 +8271,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1set_1render_1icon)
 
 #ifndef NO__1gtk_1icon_1source_1free
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1source_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1source_1free_FUNC);
 	gtk_icon_source_free((GtkIconSource *)arg0);
@@ -8761,12 +8280,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1source_1free)
 #endif
 
 #ifndef NO__1gtk_1icon_1source_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1source_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1source_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1source_1new_FUNC);
-	rc = (jint)gtk_icon_source_new();
+	rc = (jintLong)gtk_icon_source_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1icon_1source_1new_FUNC);
 	return rc;
 }
@@ -8774,7 +8293,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1source_1new)
 
 #ifndef NO__1gtk_1icon_1source_1set_1pixbuf
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1source_1set_1pixbuf)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1source_1set_1pixbuf_FUNC);
 	gtk_icon_source_set_pixbuf((GtkIconSource *)arg0, (GdkPixbuf *)arg1);
@@ -8784,7 +8303,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1source_1set_1pixbuf)
 
 #ifndef NO__1gtk_1im_1context_1filter_1keypress
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1im_1context_1filter_1keypress)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1filter_1keypress_FUNC);
@@ -8796,7 +8315,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1im_1context_1filter_1keypress)
 
 #ifndef NO__1gtk_1im_1context_1focus_1in
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1focus_1in)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1focus_1in_FUNC);
 	gtk_im_context_focus_in((GtkIMContext *)arg0);
@@ -8806,7 +8325,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1focus_1in)
 
 #ifndef NO__1gtk_1im_1context_1focus_1out
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1focus_1out)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1focus_1out_FUNC);
 	gtk_im_context_focus_out((GtkIMContext *)arg0);
@@ -8816,31 +8335,31 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1focus_1out)
 
 #ifndef NO__1gtk_1im_1context_1get_1preedit_1string
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1preedit_1string)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jintArray arg3)
 {
-	jint *lparg1=NULL;
-	jint *lparg2=NULL;
+	jintLong *lparg1=NULL;
+	jintLong *lparg2=NULL;
 	jint *lparg3=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1get_1preedit_1string_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gtk_im_context_get_preedit_string((GtkIMContext *)arg0, (gchar **)lparg1, (PangoAttrList **)lparg2, (gint *)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1get_1preedit_1string_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1im_1context_1get_1type
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1type)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1type)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1get_1type_FUNC);
-	rc = (jint)gtk_im_context_get_type();
+	rc = (jintLong)gtk_im_context_get_type();
 	OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1get_1type_FUNC);
 	return rc;
 }
@@ -8848,7 +8367,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1type)
 
 #ifndef NO__1gtk_1im_1context_1reset
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1reset)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1reset_FUNC);
 	gtk_im_context_reset((GtkIMContext *)arg0);
@@ -8858,7 +8377,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1reset)
 
 #ifndef NO__1gtk_1im_1context_1set_1client_1window
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1set_1client_1window)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1set_1client_1window_FUNC);
 	gtk_im_context_set_client_window((GtkIMContext *)arg0, (GdkWindow *)arg1);
@@ -8868,7 +8387,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1set_1client_1window)
 
 #ifndef NO__1gtk_1im_1context_1set_1cursor_1location
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1set_1cursor_1location)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1set_1cursor_1location_FUNC);
@@ -8881,7 +8400,7 @@ fail:
 
 #ifndef NO__1gtk_1im_1multicontext_1append_1menuitems
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1append_1menuitems)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1append_1menuitems_FUNC);
 	gtk_im_multicontext_append_menuitems((GtkIMMulticontext *)arg0, (GtkMenuShell *)arg1);
@@ -8890,26 +8409,26 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1append_1menuitems)
 #endif
 
 #ifndef NO__1gtk_1im_1multicontext_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1new_FUNC);
-	rc = (jint)gtk_im_multicontext_new();
+	rc = (jintLong)gtk_im_multicontext_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1im_1multicontext_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1image_1menu_1item_1new_1with_1label
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1new_1with_1label)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1new_1with_1label)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1image_1menu_1item_1new_1with_1label_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_image_menu_item_new_with_label((const gchar *)lparg0);
+	rc = (jintLong)gtk_image_menu_item_new_with_label((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1image_1menu_1item_1new_1with_1label_FUNC);
@@ -8919,7 +8438,7 @@ fail:
 
 #ifndef NO__1gtk_1image_1menu_1item_1set_1image
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1set_1image)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1image_1menu_1item_1set_1image_FUNC);
 	gtk_image_menu_item_set_image((GtkImageMenuItem *)arg0, (GtkWidget *)arg1);
@@ -8928,36 +8447,36 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1set_1image)
 #endif
 
 #ifndef NO__1gtk_1image_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1image_1new_FUNC);
-	rc = (jint)gtk_image_new();
+	rc = (jintLong)gtk_image_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1image_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1image_1new_1from_1pixbuf
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixbuf)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixbuf)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1pixbuf_FUNC);
-	rc = (jint)gtk_image_new_from_pixbuf((GdkPixbuf *)arg0);
+	rc = (jintLong)gtk_image_new_from_pixbuf((GdkPixbuf *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1image_1new_1from_1pixbuf_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1image_1new_1from_1pixmap
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixmap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixmap)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1pixmap_FUNC);
-	rc = (jint)gtk_image_new_from_pixmap((GdkPixmap *)arg0, (GdkBitmap *)arg1);
+	rc = (jintLong)gtk_image_new_from_pixmap((GdkPixmap *)arg0, (GdkBitmap *)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1image_1new_1from_1pixmap_FUNC);
 	return rc;
 }
@@ -8965,7 +8484,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixmap)
 
 #ifndef NO__1gtk_1image_1set_1from_1pixbuf
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixbuf)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1pixbuf_FUNC);
 	gtk_image_set_from_pixbuf((GtkImage *)arg0, (GdkPixbuf *)arg1);
@@ -8975,7 +8494,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixbuf)
 
 #ifndef NO__1gtk_1image_1set_1from_1pixmap
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixmap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1pixmap_FUNC);
 	gtk_image_set_from_pixmap((GtkImage *)arg0, (GdkBitmap *)arg1, (GdkBitmap *)arg2);
@@ -8985,30 +8504,30 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixmap)
 
 #ifndef NO__1gtk_1init_1check
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1init_1check)
-	(JNIEnv *env, jclass that, jintArray arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLongArray arg0, jintLongArray arg1)
 {
-	jint *lparg0=NULL;
-	jint *lparg1=NULL;
+	jintLong *lparg0=NULL;
+	jintLong *lparg1=NULL;
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1init_1check_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jboolean)gtk_init_check((int *)lparg0, (char ***)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1init_1check_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1label_1get_1layout
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1layout)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1label_1get_1layout)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1label_1get_1layout_FUNC);
-	rc = (jint)gtk_label_get_layout((GtkLabel *)arg0);
+	rc = (jintLong)gtk_label_get_layout((GtkLabel *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1label_1get_1layout_FUNC);
 	return rc;
 }
@@ -9016,7 +8535,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1layout)
 
 #ifndef NO__1gtk_1label_1get_1mnemonic_1keyval
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1mnemonic_1keyval)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1label_1get_1mnemonic_1keyval_FUNC);
@@ -9027,14 +8546,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1mnemonic_1keyval)
 #endif
 
 #ifndef NO__1gtk_1label_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1label_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1label_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_label_new((const gchar *)lparg0);
+	rc = (jintLong)gtk_label_new((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1label_1new_FUNC);
@@ -9043,14 +8562,14 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1label_1new_1with_1mnemonic
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1new_1with_1mnemonic)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1label_1new_1with_1mnemonic)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1label_1new_1with_1mnemonic_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_label_new_with_mnemonic((const gchar *)lparg0);
+	rc = (jintLong)gtk_label_new_with_mnemonic((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1label_1new_1with_1mnemonic_FUNC);
@@ -9060,7 +8579,7 @@ fail:
 
 #ifndef NO__1gtk_1label_1set_1attributes
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1attributes)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1attributes_FUNC);
 	gtk_label_set_attributes((GtkLabel *)arg0, (PangoAttrList *)arg1);
@@ -9070,7 +8589,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1attributes)
 
 #ifndef NO__1gtk_1label_1set_1justify
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1justify)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1justify_FUNC);
 	gtk_label_set_justify((GtkLabel *)arg0, (GtkJustification)arg1);
@@ -9080,7 +8599,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1justify)
 
 #ifndef NO__1gtk_1label_1set_1line_1wrap
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1line_1wrap)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1line_1wrap_FUNC);
 	gtk_label_set_line_wrap((GtkLabel *)arg0, (gboolean)arg1);
@@ -9090,57 +8609,71 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1line_1wrap)
 
 #ifndef NO__1gtk_1label_1set_1line_1wrap_1mode
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1line_1wrap_1mode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1line_1wrap_1mode_FUNC);
 /*
 	gtk_label_set_line_wrap_mode(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_label_set_line_wrap_mode_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_label_set_line_wrap_mode");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_label_set_line_wrap_mode)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1line_1wrap_1mode_FUNC);
 }
 #endif
 
-#ifndef NO__1gtk_1label_1set_1text__II
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO__1gtk_1label_1set_1text__II) && !defined(JNI64)) || (!defined(NO__1gtk_1label_1set_1text__JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__JJ_FUNC);
+#endif
 	gtk_label_set_text((GtkLabel *)arg0, (const gchar *)arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1gtk_1label_1set_1text__I_3B
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__I_3B)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+#if (!defined(NO__1gtk_1label_1set_1text__I_3B) && !defined(JNI64)) || (!defined(NO__1gtk_1label_1set_1text__J_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#endif
 {
 	jbyte *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__I_3B_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__J_3B_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_label_set_text((GtkLabel *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__I_3B_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__J_3B_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO__1gtk_1label_1set_1text_1with_1mnemonic
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text_1with_1mnemonic)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text_1with_1mnemonic_FUNC);
@@ -9154,7 +8687,7 @@ fail:
 
 #ifndef NO__1gtk_1list_1append_1items
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1append_1items)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1append_1items_FUNC);
 	gtk_list_append_items((GtkList *)arg0, (GList *)arg1);
@@ -9164,7 +8697,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1append_1items)
 
 #ifndef NO__1gtk_1list_1clear_1items
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1clear_1items)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1clear_1items_FUNC);
 	gtk_list_clear_items((GtkList *)arg0, arg1, arg2);
@@ -9174,7 +8707,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1clear_1items)
 
 #ifndef NO__1gtk_1list_1insert_1items
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1insert_1items)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1insert_1items_FUNC);
 	gtk_list_insert_items((GtkList *)arg0, (GList *)arg1, arg2);
@@ -9183,14 +8716,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1insert_1items)
 #endif
 
 #ifndef NO__1gtk_1list_1item_1new_1with_1label
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1list_1item_1new_1with_1label)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1list_1item_1new_1with_1label)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1item_1new_1with_1label_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_list_item_new_with_label((const gchar *)lparg0);
+	rc = (jintLong)gtk_list_item_new_with_label((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1list_1item_1new_1with_1label_FUNC);
@@ -9200,7 +8733,7 @@ fail:
 
 #ifndef NO__1gtk_1list_1remove_1items
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1remove_1items)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1remove_1items_FUNC);
 	gtk_list_remove_items((GtkList *)arg0, (GList *)arg1);
@@ -9210,7 +8743,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1remove_1items)
 
 #ifndef NO__1gtk_1list_1select_1item
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1select_1item)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1select_1item_FUNC);
 	gtk_list_select_item((GtkList *)arg0, arg1);
@@ -9220,7 +8753,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1select_1item)
 
 #ifndef NO__1gtk_1list_1store_1append
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1append)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1append_FUNC);
 	gtk_list_store_append((GtkListStore *)arg0, (GtkTreeIter *)arg1);
@@ -9230,7 +8763,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1append)
 
 #ifndef NO__1gtk_1list_1store_1clear
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1clear)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1clear_FUNC);
 	gtk_list_store_clear((GtkListStore *)arg0);
@@ -9240,7 +8773,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1clear)
 
 #ifndef NO__1gtk_1list_1store_1insert
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1insert)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1insert_FUNC);
 	gtk_list_store_insert((GtkListStore *)arg0, (GtkTreeIter *)arg1, (gint)arg2);
@@ -9249,16 +8782,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1insert)
 #endif
 
 #ifndef NO__1gtk_1list_1store_1newv
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1list_1store_1newv)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1list_1store_1newv)
+	(JNIEnv *env, jclass that, jint arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
-	jint rc = 0;
+	jintLong *lparg1=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1newv_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_list_store_newv((gint)arg0, (GType *)lparg1);
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)gtk_list_store_newv((gint)arg0, (GType *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1newv_FUNC);
 	return rc;
 }
@@ -9266,7 +8799,7 @@ fail:
 
 #ifndef NO__1gtk_1list_1store_1remove
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1remove)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1remove_FUNC);
 	gtk_list_store_remove((GtkListStore *)arg0, (GtkTreeIter *)arg1);
@@ -9274,66 +8807,121 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1remove)
 }
 #endif
 
-#ifndef NO__1gtk_1list_1store_1set__IIIII
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO__1gtk_1list_1store_1set__IIIII) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJIIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJIIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIIJ_FUNC);
+#endif
 	gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIIJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1gtk_1list_1store_1set__IIIJI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIJI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jint arg4)
+#if (!defined(NO__1gtk_1list_1store_1set__IIIJI) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJIJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJIJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jintLong arg4)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIJI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIJJ_FUNC);
+#endif
 	gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIJI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
+#if (!defined(NO__1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4)
+#endif
 {
 	GdkColor _arg3, *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
 	gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1gtk_1list_1store_1set__IIIZI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIZI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jint arg4)
+#if (!defined(NO__1gtk_1list_1store_1set__IIIZI) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJIZJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJIZJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jintLong arg4)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIZI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIZJ_FUNC);
+#endif
 	gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIZI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIZJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1gtk_1list_1store_1set__III_3BI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__III_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4)
+#if (!defined(NO__1gtk_1list_1store_1set__III_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJI_3BJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__III_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJI_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintLong arg4)
+#endif
 {
 	jbyte *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__III_3BI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJI_3BJ_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__III_3BI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJI_3BJ_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO__1gtk_1list_1unselect_1all
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1unselect_1all)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1unselect_1all_FUNC);
 	gtk_list_unselect_all((GtkList *)arg0);
@@ -9343,7 +8931,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1unselect_1all)
 
 #ifndef NO__1gtk_1list_1unselect_1item
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1unselect_1item)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1list_1unselect_1item_FUNC);
 	gtk_list_unselect_item((GtkList *)arg0, arg1);
@@ -9363,7 +8951,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1main)
 
 #ifndef NO__1gtk_1main_1do_1event
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1main_1do_1event)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1main_1do_1event_FUNC);
 	gtk_main_do_event((GdkEvent *)arg0);
@@ -9396,24 +8984,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1major_1version)
 #endif
 
 #ifndef NO__1gtk_1menu_1bar_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1bar_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1bar_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1bar_1new_FUNC);
-	rc = (jint)gtk_menu_bar_new();
+	rc = (jintLong)gtk_menu_bar_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1bar_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1item_1get_1submenu
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1item_1get_1submenu)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1item_1get_1submenu)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1get_1submenu_FUNC);
-	rc = (jint)gtk_menu_item_get_submenu((GtkMenuItem *)arg0);
+	rc = (jintLong)gtk_menu_item_get_submenu((GtkMenuItem *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1get_1submenu_FUNC);
 	return rc;
 }
@@ -9421,7 +9009,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1item_1get_1submenu)
 
 #ifndef NO__1gtk_1menu_1item_1remove_1submenu
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1item_1remove_1submenu)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1remove_1submenu_FUNC);
 	gtk_menu_item_remove_submenu((GtkMenuItem *)arg0);
@@ -9431,7 +9019,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1item_1remove_1submenu)
 
 #ifndef NO__1gtk_1menu_1item_1set_1submenu
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1item_1set_1submenu)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1set_1submenu_FUNC);
 	gtk_menu_item_set_submenu((GtkMenuItem *)arg0, (GtkWidget *)arg1);
@@ -9440,12 +9028,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1item_1set_1submenu)
 #endif
 
 #ifndef NO__1gtk_1menu_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1new_FUNC);
-	rc = (jint)gtk_menu_new();
+	rc = (jintLong)gtk_menu_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1new_FUNC);
 	return rc;
 }
@@ -9453,7 +9041,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1new)
 
 #ifndef NO__1gtk_1menu_1popdown
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popdown)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1popdown_FUNC);
 	gtk_menu_popdown((GtkMenu *)arg0);
@@ -9463,7 +9051,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popdown)
 
 #ifndef NO__1gtk_1menu_1popup
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popup)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jint arg6)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1popup_FUNC);
 	gtk_menu_popup((GtkMenu *)arg0, (GtkWidget *)arg1, (GtkWidget *)arg2, (GtkMenuPositionFunc)arg3, (gpointer)arg4, (guint)arg5, (guint32)arg6);
@@ -9473,7 +9061,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popup)
 
 #ifndef NO__1gtk_1menu_1shell_1deactivate
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1deactivate)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1deactivate_FUNC);
 	gtk_menu_shell_deactivate((GtkMenuShell *)arg0);
@@ -9483,7 +9071,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1deactivate)
 
 #ifndef NO__1gtk_1menu_1shell_1insert
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1insert)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1insert_FUNC);
 	gtk_menu_shell_insert((GtkMenuShell *)arg0, (GtkWidget *)arg1, (gint)arg2);
@@ -9493,7 +9081,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1insert)
 
 #ifndef NO__1gtk_1menu_1shell_1select_1item
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1select_1item)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1select_1item_FUNC);
 	gtk_menu_shell_select_item((GtkMenuShell *)arg0, (GtkWidget *)arg1);
@@ -9503,24 +9091,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1select_1item)
 
 #ifndef NO__1gtk_1menu_1shell_1set_1take_1focus
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1set_1take_1focus)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1set_1take_1focus_FUNC);
 /*
 	gtk_menu_shell_set_take_focus((GtkMenuShell *)arg0, (gboolean)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GtkMenuShell *, gboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_menu_shell_set_take_focus_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_menu_shell_set_take_focus");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GtkMenuShell *)arg0, (gboolean)arg1);
+		LOAD_FUNCTION(fp, gtk_menu_shell_set_take_focus)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkMenuShell *, gboolean))fp)((GtkMenuShell *)arg0, (gboolean)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1shell_1set_1take_1focus_FUNC);
@@ -9528,14 +9108,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1set_1take_1focus)
 #endif
 
 #ifndef NO__1gtk_1message_1dialog_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1message_1dialog_1new)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1message_1dialog_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
 {
 	jbyte *lparg4=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1message_1dialog_1new_FUNC);
 	if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, (const gchar *)lparg4);
+	rc = (jintLong)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, (const gchar *)lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1message_1dialog_1new_FUNC);
@@ -9569,7 +9149,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1minor_1version)
 
 #ifndef NO__1gtk_1misc_1set_1alignment
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1misc_1set_1alignment)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1misc_1set_1alignment_FUNC);
 	gtk_misc_set_alignment((GtkMisc *)arg0, (gfloat)arg1, (gfloat)arg2);
@@ -9579,7 +9159,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1misc_1set_1alignment)
 
 #ifndef NO__1gtk_1notebook_1get_1current_1page
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1notebook_1get_1current_1page)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1get_1current_1page_FUNC);
@@ -9591,7 +9171,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1notebook_1get_1current_1page)
 
 #ifndef NO__1gtk_1notebook_1get_1scrollable
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1notebook_1get_1scrollable)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1get_1scrollable_FUNC);
@@ -9603,7 +9183,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1notebook_1get_1scrollable)
 
 #ifndef NO__1gtk_1notebook_1insert_1page
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1insert_1page)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1insert_1page_FUNC);
 	gtk_notebook_insert_page((GtkNotebook *)arg0, (GtkWidget *)arg1, (GtkWidget *)arg2, (gint)arg3);
@@ -9612,12 +9192,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1insert_1page)
 #endif
 
 #ifndef NO__1gtk_1notebook_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1notebook_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1notebook_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1new_FUNC);
-	rc = (jint)gtk_notebook_new();
+	rc = (jintLong)gtk_notebook_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1new_FUNC);
 	return rc;
 }
@@ -9625,7 +9205,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1notebook_1new)
 
 #ifndef NO__1gtk_1notebook_1next_1page
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1next_1page)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1next_1page_FUNC);
 	gtk_notebook_next_page((GtkNotebook *)arg0);
@@ -9635,7 +9215,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1next_1page)
 
 #ifndef NO__1gtk_1notebook_1prev_1page
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1prev_1page)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1prev_1page_FUNC);
 	gtk_notebook_prev_page((GtkNotebook *)arg0);
@@ -9645,7 +9225,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1prev_1page)
 
 #ifndef NO__1gtk_1notebook_1remove_1page
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1remove_1page)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1remove_1page_FUNC);
 	gtk_notebook_remove_page((GtkNotebook *)arg0, (gint)arg1);
@@ -9655,7 +9235,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1remove_1page)
 
 #ifndef NO__1gtk_1notebook_1set_1current_1page
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1current_1page)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1current_1page_FUNC);
 	gtk_notebook_set_current_page((GtkNotebook *)arg0, (gint)arg1);
@@ -9665,7 +9245,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1current_1page)
 
 #ifndef NO__1gtk_1notebook_1set_1scrollable
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1scrollable)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1scrollable_FUNC);
 	gtk_notebook_set_scrollable((GtkNotebook *)arg0, (gboolean)arg1);
@@ -9675,7 +9255,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1scrollable)
 
 #ifndef NO__1gtk_1notebook_1set_1show_1tabs
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1show_1tabs)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1show_1tabs_FUNC);
 	gtk_notebook_set_show_tabs((GtkNotebook *)arg0, (gboolean)arg1);
@@ -9685,7 +9265,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1show_1tabs)
 
 #ifndef NO__1gtk_1notebook_1set_1tab_1pos
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1tab_1pos)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1tab_1pos_FUNC);
 	gtk_notebook_set_tab_pos((GtkNotebook *)arg0, (GtkPositionType)arg1);
@@ -9695,7 +9275,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1tab_1pos)
 
 #ifndef NO__1gtk_1object_1sink
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1object_1sink)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1object_1sink_FUNC);
 	gtk_object_sink((GtkObject *)arg0);
@@ -9705,7 +9285,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1object_1sink)
 
 #ifndef NO__1gtk_1page_1setup_1get_1bottom_1margin
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC);
@@ -9713,18 +9293,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin)
 	rc = (jdouble)gtk_page_setup_get_bottom_margin(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_get_bottom_margin_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_bottom_margin");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_page_setup_get_bottom_margin)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC);
@@ -9734,7 +9305,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin)
 
 #ifndef NO__1gtk_1page_1setup_1get_1left_1margin
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1left_1margin)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1left_1margin_FUNC);
@@ -9742,18 +9313,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1left_1margin)
 	rc = (jdouble)gtk_page_setup_get_left_margin(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_get_left_margin_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_left_margin");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_page_setup_get_left_margin)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1left_1margin_FUNC);
@@ -9763,7 +9325,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1left_1margin)
 
 #ifndef NO__1gtk_1page_1setup_1get_1orientation
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1orientation)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1orientation_FUNC);
@@ -9771,18 +9333,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1orientation)
 	rc = (jint)gtk_page_setup_get_orientation(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_get_orientation_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_orientation");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_page_setup_get_orientation)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1orientation_FUNC);
@@ -9792,7 +9345,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1orientation)
 
 #ifndef NO__1gtk_1page_1setup_1get_1page_1height
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1height)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1height_FUNC);
@@ -9800,18 +9353,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1height)
 	rc = (jdouble)gtk_page_setup_get_page_height(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_get_page_height_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_page_height");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_page_setup_get_page_height)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1page_1height_FUNC);
@@ -9821,7 +9365,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1height)
 
 #ifndef NO__1gtk_1page_1setup_1get_1page_1width
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1width)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1width_FUNC);
@@ -9829,18 +9373,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1width)
 	rc = (jdouble)gtk_page_setup_get_page_width(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_get_page_width_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_page_width");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_page_setup_get_page_width)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1page_1width_FUNC);
@@ -9850,7 +9385,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1width)
 
 #ifndef NO__1gtk_1page_1setup_1get_1paper_1height
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1height)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1height_FUNC);
@@ -9858,18 +9393,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1height)
 	rc = (jdouble)gtk_page_setup_get_paper_height(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_get_paper_height_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_paper_height");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_page_setup_get_paper_height)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1height_FUNC);
@@ -9878,27 +9404,18 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1height)
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1get_1paper_1size
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1size)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1size)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC);
 /*
-	rc = (jint)gtk_page_setup_get_paper_size(arg0);
+	rc = (jintLong)gtk_page_setup_get_paper_size(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_get_paper_size_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_paper_size");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_page_setup_get_paper_size)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC);
@@ -9908,7 +9425,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1size)
 
 #ifndef NO__1gtk_1page_1setup_1get_1paper_1width
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1width)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1width_FUNC);
@@ -9916,18 +9433,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1width)
 	rc = (jdouble)gtk_page_setup_get_paper_width(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_get_paper_width_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_paper_width");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_page_setup_get_paper_width)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1width_FUNC);
@@ -9937,7 +9445,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1width)
 
 #ifndef NO__1gtk_1page_1setup_1get_1right_1margin
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1right_1margin)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1right_1margin_FUNC);
@@ -9945,18 +9453,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1right_1margin)
 	rc = (jdouble)gtk_page_setup_get_right_margin(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_get_right_margin_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_right_margin");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_page_setup_get_right_margin)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1right_1margin_FUNC);
@@ -9966,7 +9465,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1right_1margin)
 
 #ifndef NO__1gtk_1page_1setup_1get_1top_1margin
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1top_1margin)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1top_1margin_FUNC);
@@ -9974,18 +9473,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1top_1margin)
 	rc = (jdouble)gtk_page_setup_get_top_margin(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_get_top_margin_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_top_margin");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_page_setup_get_top_margin)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1top_1margin_FUNC);
@@ -9994,27 +9484,18 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1top_1margin)
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1page_1setup_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1new_FUNC);
 /*
-	rc = (jint)gtk_page_setup_new();
+	rc = (jintLong)gtk_page_setup_new();
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)();
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_new_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_new");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)();
+		LOAD_FUNCTION(fp, gtk_page_setup_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1new_FUNC);
@@ -10024,24 +9505,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1new)
 
 #ifndef NO__1gtk_1page_1setup_1set_1bottom_1margin
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1bottom_1margin)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1bottom_1margin_FUNC);
 /*
 	gtk_page_setup_set_bottom_margin(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jdouble, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_set_bottom_margin_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_set_bottom_margin");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, gtk_page_setup_set_bottom_margin)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1bottom_1margin_FUNC);
@@ -10050,24 +9523,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1bottom_1margin)
 
 #ifndef NO__1gtk_1page_1setup_1set_1left_1margin
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1left_1margin)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1left_1margin_FUNC);
 /*
 	gtk_page_setup_set_left_margin(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jdouble, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_set_left_margin_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_set_left_margin");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, gtk_page_setup_set_left_margin)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1left_1margin_FUNC);
@@ -10076,24 +9541,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1left_1margin)
 
 #ifndef NO__1gtk_1page_1setup_1set_1orientation
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1orientation)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1orientation_FUNC);
 /*
 	gtk_page_setup_set_orientation(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_set_orientation_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_set_orientation");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_page_setup_set_orientation)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1orientation_FUNC);
@@ -10102,24 +9559,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1orientation)
 
 #ifndef NO__1gtk_1page_1setup_1set_1paper_1size
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1paper_1size)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1paper_1size_FUNC);
 /*
 	gtk_page_setup_set_paper_size(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_set_paper_size_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_set_paper_size");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_page_setup_set_paper_size)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1paper_1size_FUNC);
@@ -10128,24 +9577,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1paper_1size)
 
 #ifndef NO__1gtk_1page_1setup_1set_1right_1margin
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1right_1margin)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1right_1margin_FUNC);
 /*
 	gtk_page_setup_set_right_margin(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jdouble, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_set_right_margin_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_set_right_margin");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, gtk_page_setup_set_right_margin)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1right_1margin_FUNC);
@@ -10154,24 +9595,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1right_1margin)
 
 #ifndef NO__1gtk_1page_1setup_1set_1top_1margin
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1top_1margin)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1top_1margin_FUNC);
 /*
 	gtk_page_setup_set_top_margin(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jdouble, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_page_setup_set_top_margin_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_set_top_margin");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, gtk_page_setup_set_top_margin)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1top_1margin_FUNC);
@@ -10180,7 +9613,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1top_1margin)
 
 #ifndef NO__1gtk_1paint_1arrow
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1arrow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jboolean arg8, jint arg9, jint arg10, jint arg11, jint arg12)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jboolean arg8, jint arg9, jint arg10, jint arg11, jint arg12)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10197,7 +9630,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1box
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1box)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10214,7 +9647,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1box_1gap
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1box_1gap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10231,7 +9664,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1check
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1check)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10248,7 +9681,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1expander
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1expander)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
 {
 	GdkRectangle _arg3, *lparg3=NULL;
 	jbyte *lparg5=NULL;
@@ -10265,7 +9698,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1extension
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1extension)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10282,7 +9715,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1flat_1box
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1flat_1box)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10299,7 +9732,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1focus
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1focus)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8, jint arg9)
 {
 	GdkRectangle _arg3, *lparg3=NULL;
 	jbyte *lparg5=NULL;
@@ -10315,7 +9748,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1handle
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1handle)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10331,7 +9764,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1hline
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1hline)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
 {
 	GdkRectangle _arg3, *lparg3=NULL;
 	jbyte *lparg5=NULL;
@@ -10348,7 +9781,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1layout
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1layout)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jintLong arg9)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10365,7 +9798,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1option
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1option)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10382,7 +9815,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1shadow
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1shadow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10399,7 +9832,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1shadow_1gap
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1shadow_1gap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10416,7 +9849,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1slider
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1slider)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10433,7 +9866,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1tab
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1tab)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
@@ -10450,7 +9883,7 @@ fail:
 
 #ifndef NO__1gtk_1paint_1vline
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1vline)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
 {
 	GdkRectangle _arg3, *lparg3=NULL;
 	jbyte *lparg5=NULL;
@@ -10467,24 +9900,16 @@ fail:
 
 #ifndef NO__1gtk_1paper_1size_1free
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paper_1size_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1free_FUNC);
 /*
 	gtk_paper_size_free(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_paper_size_free_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_free");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_paper_size_free)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1free_FUNC);
@@ -10492,27 +9917,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paper_1size_1free)
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1get_1display_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1display_1name)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1display_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC);
 /*
-	rc = (jint)gtk_paper_size_get_display_name(arg0);
+	rc = (jintLong)gtk_paper_size_get_display_name(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_paper_size_get_display_name_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_get_display_name");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_paper_size_get_display_name)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC);
@@ -10522,7 +9938,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1display_1name)
 
 #ifndef NO__1gtk_1paper_1size_1get_1height
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1height)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1height_FUNC);
@@ -10530,18 +9946,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1height)
 	rc = (jdouble)gtk_paper_size_get_height(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_paper_size_get_height_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_get_height");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_paper_size_get_height)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1height_FUNC);
@@ -10550,27 +9957,18 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1height)
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1get_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1name)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1name_FUNC);
 /*
-	rc = (jint)gtk_paper_size_get_name(arg0);
+	rc = (jintLong)gtk_paper_size_get_name(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_paper_size_get_name_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_get_name");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_paper_size_get_name)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1name_FUNC);
@@ -10579,27 +9977,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1name)
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1get_1ppd_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC);
 /*
-	rc = (jint)gtk_paper_size_get_ppd_name(arg0);
+	rc = (jintLong)gtk_paper_size_get_ppd_name(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_paper_size_get_ppd_name_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_get_ppd_name");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_paper_size_get_ppd_name)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC);
@@ -10609,7 +9998,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name)
 
 #ifndef NO__1gtk_1paper_1size_1get_1width
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1width)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1width_FUNC);
@@ -10617,18 +10006,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1width)
 	rc = (jdouble)gtk_paper_size_get_width(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_paper_size_get_width_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_get_width");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_paper_size_get_width)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1width_FUNC);
@@ -10638,7 +10018,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1width)
 
 #ifndef NO__1gtk_1paper_1size_1is_1custom
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1paper_1size_1is_1custom)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1is_1custom_FUNC);
@@ -10646,18 +10026,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1paper_1size_1is_1custom)
 	rc = (jboolean)gtk_paper_size_is_custom(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_paper_size_is_custom_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_is_custom");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_paper_size_is_custom)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1is_1custom_FUNC);
@@ -10666,29 +10037,20 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1paper_1size_1is_1custom)
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)gtk_paper_size_new(lparg0);
+	rc = (jintLong)gtk_paper_size_new(lparg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jbyte *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_paper_size_new_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_new");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(lparg0);
+		LOAD_FUNCTION(fp, gtk_paper_size_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
 		}
 	}
 fail:
@@ -10699,31 +10061,22 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1new_1custom
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1custom)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1custom)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jdouble arg2, jdouble arg3, jint arg4)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_1custom_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)gtk_paper_size_new_custom(lparg0, lparg1, arg2, arg3, arg4);
+	rc = (jintLong)gtk_paper_size_new_custom(lparg0, lparg1, arg2, arg3, arg4);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jbyte *, jbyte *, jdouble, jdouble, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_paper_size_new_custom_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_new_custom");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(lparg0, lparg1, arg2, arg3, arg4);
+		LOAD_FUNCTION(fp, gtk_paper_size_new_custom)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jdouble, jdouble, jint))fp)(lparg0, lparg1, arg2, arg3, arg4);
 		}
 	}
 fail:
@@ -10735,31 +10088,22 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1new_1from_1ppd
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1from_1ppd)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1from_1ppd)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jdouble arg2, jdouble arg3)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_1from_1ppd_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)gtk_paper_size_new_from_ppd(lparg0, lparg1, arg2, arg3);
+	rc = (jintLong)gtk_paper_size_new_from_ppd(lparg0, lparg1, arg2, arg3);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jbyte *, jbyte *, jdouble, jdouble);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_paper_size_new_from_ppd_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_new_from_ppd");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(lparg0, lparg1, arg2, arg3);
+		LOAD_FUNCTION(fp, gtk_paper_size_new_from_ppd)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jdouble, jdouble))fp)(lparg0, lparg1, arg2, arg3);
 		}
 	}
 fail:
@@ -10771,51 +10115,42 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1plug_1get_1id
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1plug_1get_1id)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1plug_1get_1id)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1plug_1get_1id_FUNC);
-	rc = (jint)gtk_plug_get_id((GtkPlug *)arg0);
+	rc = (jintLong)gtk_plug_get_id((GtkPlug *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1plug_1get_1id_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1plug_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1plug_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1plug_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1plug_1new_FUNC);
-	rc = (jint)gtk_plug_new(arg0);
+	rc = (jintLong)gtk_plug_new(arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1plug_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1job_1get_1printer
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1printer)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1printer)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1printer_FUNC);
 /*
-	rc = (jint)gtk_print_job_get_printer(arg0);
+	rc = (jintLong)gtk_print_job_get_printer(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_job_get_printer_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_get_printer");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_job_get_printer)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1printer_FUNC);
@@ -10824,27 +10159,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1printer)
 #endif
 
 #ifndef NO__1gtk_1print_1job_1get_1settings
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1settings)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1settings)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1settings_FUNC);
 /*
-	rc = (jint)gtk_print_job_get_settings(arg0);
+	rc = (jintLong)gtk_print_job_get_settings(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_job_get_settings_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_get_settings");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_job_get_settings)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1settings_FUNC);
@@ -10854,7 +10180,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1settings)
 
 #ifndef NO__1gtk_1print_1job_1get_1status
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1status)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1status_FUNC);
@@ -10862,18 +10188,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1status)
 	rc = (jint)gtk_print_job_get_status(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_job_get_status_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_get_status");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_job_get_status)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1status_FUNC);
@@ -10882,60 +10199,42 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1status)
 #endif
 
 #ifndef NO__1gtk_1print_1job_1get_1surface
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1surface)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1surface)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
-	jint rc = 0;
+	jintLong *lparg1=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1surface_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)gtk_print_job_get_surface(arg0, (GError **)lparg1);
+	rc = (jintLong)gtk_print_job_get_surface(arg0, (GError **)lparg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, GError **);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_job_get_surface_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_get_surface");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, (GError **)lparg1);
+		LOAD_FUNCTION(fp, gtk_print_job_get_surface)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, GError **))fp)(arg0, (GError **)lparg1);
 		}
 	}
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1surface_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1job_1get_1title
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1title)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1title)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1title_FUNC);
 /*
-	rc = (jint)gtk_print_job_get_title(arg0);
+	rc = (jintLong)gtk_print_job_get_title(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_job_get_title_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_get_title");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_job_get_title)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1title_FUNC);
@@ -10944,29 +10243,20 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1title)
 #endif
 
 #ifndef NO__1gtk_1print_1job_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1new)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1new)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLong arg2, jintLong arg3)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)gtk_print_job_new((const gchar *)lparg0, arg1, arg2, arg3);
+	rc = (jintLong)gtk_print_job_new((const gchar *)lparg0, arg1, arg2, arg3);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(const gchar *, jint, jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_job_new_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_new");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((const gchar *)lparg0, arg1, arg2, arg3);
+		LOAD_FUNCTION(fp, gtk_print_job_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, jintLong, jintLong, jintLong))fp)((const gchar *)lparg0, arg1, arg2, arg3);
 		}
 	}
 fail:
@@ -10978,24 +10268,16 @@ fail:
 
 #ifndef NO__1gtk_1print_1job_1send
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1job_1send)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1send_FUNC);
 /*
 	gtk_print_job_send(arg0, arg1, (gpointer)arg2, (GDestroyNotify)arg3);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint, gpointer, GDestroyNotify);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_job_send_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_send");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, (gpointer)arg2, (GDestroyNotify)arg3);
+		LOAD_FUNCTION(fp, gtk_print_job_send)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, gpointer, GDestroyNotify))fp)(arg0, arg1, (gpointer)arg2, (GDestroyNotify)arg3);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1send_FUNC);
@@ -11004,34 +10286,25 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1job_1send)
 
 #ifndef NO__1gtk_1print_1job_1set_1source_1file
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1job_1set_1source_1file)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLongArray arg2)
 {
 	jbyte *lparg1=NULL;
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1set_1source_1file_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 /*
 	rc = (jboolean)gtk_print_job_set_source_file(arg0, (const gchar *)lparg1, (GError **)lparg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(jint, const gchar *, GError **);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_job_set_source_file_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_set_source_file");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)(arg0, (const gchar *)lparg1, (GError **)lparg2);
+		LOAD_FUNCTION(fp, gtk_print_job_set_source_file)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, const gchar *, GError **))fp)(arg0, (const gchar *)lparg1, (GError **)lparg2);
 		}
 	}
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1set_1source_1file_FUNC);
 	return rc;
@@ -11040,24 +10313,16 @@ fail:
 
 #ifndef NO__1gtk_1print_1settings_1foreach
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1foreach)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1foreach_FUNC);
 /*
 	gtk_print_settings_foreach(arg0, arg1, (gpointer)arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint, gpointer);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_foreach_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_foreach");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, (gpointer)arg2);
+		LOAD_FUNCTION(fp, gtk_print_settings_foreach)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, gpointer))fp)(arg0, arg1, (gpointer)arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1foreach_FUNC);
@@ -11065,29 +10330,20 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1foreach)
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1get
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)gtk_print_settings_get(arg0, (const gchar *)lparg1);
+	rc = (jintLong)gtk_print_settings_get(arg0, (const gchar *)lparg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, const gchar *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_get_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, (const gchar *)lparg1);
+		LOAD_FUNCTION(fp, gtk_print_settings_get)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, const gchar *))fp)(arg0, (const gchar *)lparg1);
 		}
 	}
 fail:
@@ -11099,7 +10355,7 @@ fail:
 
 #ifndef NO__1gtk_1print_1settings_1get_1collate
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1collate)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1collate_FUNC);
@@ -11107,18 +10363,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1collate)
 	rc = (jboolean)gtk_print_settings_get_collate(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_get_collate_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_collate");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_settings_get_collate)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1collate_FUNC);
@@ -11128,7 +10375,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1collate)
 
 #ifndef NO__1gtk_1print_1settings_1get_1n_1copies
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1n_1copies)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1n_1copies_FUNC);
@@ -11136,18 +10383,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1n_1copies)
 	rc = (jint)gtk_print_settings_get_n_copies(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_get_n_copies_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_n_copies");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_settings_get_n_copies)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1n_1copies_FUNC);
@@ -11157,7 +10395,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1n_1copies)
 
 #ifndef NO__1gtk_1print_1settings_1get_1orientation
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1orientation)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1orientation_FUNC);
@@ -11165,18 +10403,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1orientation)
 	rc = (jint)gtk_print_settings_get_orientation(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_get_orientation_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_orientation");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_settings_get_orientation)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1orientation_FUNC);
@@ -11185,29 +10414,20 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1orientation)
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1get_1page_1ranges
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1page_1ranges)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1page_1ranges)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
 {
 	jint *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1page_1ranges_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)gtk_print_settings_get_page_ranges(arg0, (gint *)lparg1);
+	rc = (jintLong)gtk_print_settings_get_page_ranges(arg0, (gint *)lparg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, gint *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_get_page_ranges_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_page_ranges");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, (gint *)lparg1);
+		LOAD_FUNCTION(fp, gtk_print_settings_get_page_ranges)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, gint *))fp)(arg0, (gint *)lparg1);
 		}
 	}
 fail:
@@ -11219,7 +10439,7 @@ fail:
 
 #ifndef NO__1gtk_1print_1settings_1get_1paper_1height
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1height)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1paper_1height_FUNC);
@@ -11227,18 +10447,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1height)
 	rc = (jdouble)gtk_print_settings_get_paper_height(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_get_paper_height_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_paper_height");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_print_settings_get_paper_height)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1paper_1height_FUNC);
@@ -11248,7 +10459,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1height)
 
 #ifndef NO__1gtk_1print_1settings_1get_1paper_1width
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1width)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1paper_1width_FUNC);
@@ -11256,18 +10467,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1width)
 	rc = (jdouble)gtk_print_settings_get_paper_width(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_get_paper_width_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_paper_width");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_print_settings_get_paper_width)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1paper_1width_FUNC);
@@ -11277,7 +10479,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1width)
 
 #ifndef NO__1gtk_1print_1settings_1get_1print_1pages
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1print_1pages)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1print_1pages_FUNC);
@@ -11285,18 +10487,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1print_1pages)
 	rc = (jint)gtk_print_settings_get_print_pages(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_get_print_pages_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_print_pages");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_settings_get_print_pages)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1print_1pages_FUNC);
@@ -11305,27 +10498,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1print_1pages)
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1get_1printer
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1printer)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1printer)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1printer_FUNC);
 /*
-	rc = (jint)gtk_print_settings_get_printer(arg0);
+	rc = (jintLong)gtk_print_settings_get_printer(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_get_printer_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_printer");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_settings_get_printer)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1printer_FUNC);
@@ -11335,7 +10519,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1printer)
 
 #ifndef NO__1gtk_1print_1settings_1get_1resolution
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1resolution)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1resolution_FUNC);
@@ -11343,18 +10527,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1resolution)
 	rc = (jint)gtk_print_settings_get_resolution(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_get_resolution_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_resolution");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_settings_get_resolution)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1resolution_FUNC);
@@ -11363,27 +10538,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1resolution)
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1new_FUNC);
 /*
-	rc = (jint)gtk_print_settings_new();
+	rc = (jintLong)gtk_print_settings_new();
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)();
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_new_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_new");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)();
+		LOAD_FUNCTION(fp, gtk_print_settings_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1new_FUNC);
@@ -11393,7 +10559,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1new)
 
 #ifndef NO__1gtk_1print_1settings_1set
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
@@ -11404,17 +10570,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set)
 	gtk_print_settings_set(arg0, (const gchar *)lparg1, (const gchar *)lparg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, const gchar *, const gchar *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_set_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, (const gchar *)lparg1, (const gchar *)lparg2);
+		LOAD_FUNCTION(fp, gtk_print_settings_set)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, const gchar *, const gchar *))fp)(arg0, (const gchar *)lparg1, (const gchar *)lparg2);
 		}
 	}
 fail:
@@ -11426,24 +10584,16 @@ fail:
 
 #ifndef NO__1gtk_1print_1settings_1set_1collate
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1collate)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1collate_FUNC);
 /*
 	gtk_print_settings_set_collate(arg0, (gboolean)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, gboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_set_collate_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set_collate");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, (gboolean)arg1);
+		LOAD_FUNCTION(fp, gtk_print_settings_set_collate)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, gboolean))fp)(arg0, (gboolean)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1collate_FUNC);
@@ -11452,24 +10602,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1collate)
 
 #ifndef NO__1gtk_1print_1settings_1set_1n_1copies
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1n_1copies)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1n_1copies_FUNC);
 /*
 	gtk_print_settings_set_n_copies(arg0, (gint)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, gint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_set_n_copies_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set_n_copies");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, (gint)arg1);
+		LOAD_FUNCTION(fp, gtk_print_settings_set_n_copies)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, gint))fp)(arg0, (gint)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1n_1copies_FUNC);
@@ -11478,24 +10620,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1n_1copies)
 
 #ifndef NO__1gtk_1print_1settings_1set_1orientation
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1orientation)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1orientation_FUNC);
 /*
 	gtk_print_settings_set_orientation(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_set_orientation_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set_orientation");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_print_settings_set_orientation)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1orientation_FUNC);
@@ -11504,7 +10638,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1orientation)
 
 #ifndef NO__1gtk_1print_1settings_1set_1page_1ranges
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1page_1ranges)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2)
 {
 	jint *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1page_1ranges_FUNC);
@@ -11513,17 +10647,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1page_1ranges)
 	gtk_print_settings_set_page_ranges(arg0, lparg1, (gint)arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint *, gint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_set_page_ranges_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set_page_ranges");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, lparg1, (gint)arg2);
+		LOAD_FUNCTION(fp, gtk_print_settings_set_page_ranges)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jint *, gint))fp)(arg0, lparg1, (gint)arg2);
 		}
 	}
 fail:
@@ -11534,24 +10660,16 @@ fail:
 
 #ifndef NO__1gtk_1print_1settings_1set_1print_1pages
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1print_1pages)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1print_1pages_FUNC);
 /*
 	gtk_print_settings_set_print_pages(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_set_print_pages_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set_print_pages");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_print_settings_set_print_pages)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1print_1pages_FUNC);
@@ -11560,7 +10678,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1print_1pages)
 
 #ifndef NO__1gtk_1print_1settings_1set_1printer
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1printer)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1printer_FUNC);
@@ -11569,17 +10687,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1printer)
 	gtk_print_settings_set_printer(arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jbyte *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_settings_set_printer_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set_printer");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, lparg1);
+		LOAD_FUNCTION(fp, gtk_print_settings_set_printer)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -11590,7 +10700,7 @@ fail:
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1get_1current_1page
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1current_1page_FUNC);
@@ -11598,18 +10708,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page)
 	rc = (jint)gtk_print_unix_dialog_get_current_page(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_unix_dialog_get_current_page_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_get_current_page");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_current_page)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1current_1page_FUNC);
@@ -11618,27 +10719,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page)
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1get_1page_1setup
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setup)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setup)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC);
 /*
-	rc = (jint)gtk_print_unix_dialog_get_page_setup(arg0);
+	rc = (jintLong)gtk_print_unix_dialog_get_page_setup(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_unix_dialog_get_page_setup_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_get_page_setup");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_page_setup)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC);
@@ -11647,27 +10739,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setup)
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1get_1selected_1printer
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1printer)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1printer)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC);
 /*
-	rc = (jint)gtk_print_unix_dialog_get_selected_printer(arg0);
+	rc = (jintLong)gtk_print_unix_dialog_get_selected_printer(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_unix_dialog_get_selected_printer_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_get_selected_printer");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_selected_printer)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC);
@@ -11676,27 +10759,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1prin
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1get_1settings
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC);
 /*
-	rc = (jint)gtk_print_unix_dialog_get_settings(arg0);
+	rc = (jintLong)gtk_print_unix_dialog_get_settings(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_unix_dialog_get_settings_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_get_settings");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_settings)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC);
@@ -11705,29 +10779,20 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings)
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1new)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1new)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)gtk_print_unix_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1);
+	rc = (jintLong)gtk_print_unix_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(const gchar *, GtkWindow *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_unix_dialog_new_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_new");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((const gchar *)lparg0, (GtkWindow *)arg1);
+		LOAD_FUNCTION(fp, gtk_print_unix_dialog_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, GtkWindow *))fp)((const gchar *)lparg0, (GtkWindow *)arg1);
 		}
 	}
 fail:
@@ -11739,24 +10804,16 @@ fail:
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1set_1current_1page
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1current_1page)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1current_1page_FUNC);
 /*
 	gtk_print_unix_dialog_set_current_page(arg0, (gint)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, gint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_unix_dialog_set_current_page_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_set_current_page");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, (gint)arg1);
+		LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_current_page)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, gint))fp)(arg0, (gint)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1current_1page_FUNC);
@@ -11765,24 +10822,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1current_1page)
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1set_1manual_1capabilities
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1manual_1capabilities)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1manual_1capabilities_FUNC);
 /*
 	gtk_print_unix_dialog_set_manual_capabilities(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_unix_dialog_set_manual_capabilities_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_set_manual_capabilities");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_manual_capabilities)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1manual_1capabilities_FUNC);
@@ -11791,24 +10840,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1manual_1capabi
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1set_1page_1setup
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1page_1setup)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1page_1setup_FUNC);
 /*
 	gtk_print_unix_dialog_set_page_setup(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_unix_dialog_set_page_setup_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_set_page_setup");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_page_setup)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1page_1setup_FUNC);
@@ -11817,24 +10858,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1page_1setup)
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1set_1settings
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1settings)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1settings_FUNC);
 /*
 	gtk_print_unix_dialog_set_settings(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_print_unix_dialog_set_settings_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_set_settings");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_settings)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1settings_FUNC);
@@ -11842,27 +10875,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1settings)
 #endif
 
 #ifndef NO__1gtk_1printer_1get_1backend
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1printer_1get_1backend)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1printer_1get_1backend)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1backend_FUNC);
 /*
-	rc = (jint)gtk_printer_get_backend(arg0);
+	rc = (jintLong)gtk_printer_get_backend(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_printer_get_backend_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_printer_get_backend");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_printer_get_backend)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1backend_FUNC);
@@ -11871,27 +10895,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1printer_1get_1backend)
 #endif
 
 #ifndef NO__1gtk_1printer_1get_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1printer_1get_1name)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1printer_1get_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1name_FUNC);
 /*
-	rc = (jint)gtk_printer_get_name(arg0);
+	rc = (jintLong)gtk_printer_get_name(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_printer_get_name_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_printer_get_name");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_printer_get_name)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1name_FUNC);
@@ -11901,7 +10916,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1printer_1get_1name)
 
 #ifndef NO__1gtk_1printer_1is_1default
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1printer_1is_1default)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1printer_1is_1default_FUNC);
@@ -11909,18 +10924,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1printer_1is_1default)
 	rc = (jboolean)gtk_printer_is_default(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_printer_is_default_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_printer_is_default");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, gtk_printer_is_default)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1printer_1is_1default_FUNC);
@@ -11929,12 +10935,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1printer_1is_1default)
 #endif
 
 #ifndef NO__1gtk_1progress_1bar_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1progress_1bar_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1progress_1bar_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1new_FUNC);
-	rc = (jint)gtk_progress_bar_new();
+	rc = (jintLong)gtk_progress_bar_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1new_FUNC);
 	return rc;
 }
@@ -11942,7 +10948,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1progress_1bar_1new)
 
 #ifndef NO__1gtk_1progress_1bar_1pulse
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1pulse)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1pulse_FUNC);
 	gtk_progress_bar_pulse((GtkProgressBar *)arg0);
@@ -11952,7 +10958,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1pulse)
 
 #ifndef NO__1gtk_1progress_1bar_1set_1fraction
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1fraction)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1fraction_FUNC);
 	gtk_progress_bar_set_fraction((GtkProgressBar *)arg0, (gdouble)arg1);
@@ -11962,7 +10968,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1fraction)
 
 #ifndef NO__1gtk_1progress_1bar_1set_1orientation
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1orientation)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1orientation_FUNC);
 	gtk_progress_bar_set_orientation((GtkProgressBar *)arg0, (GtkProgressBarOrientation)arg1);
@@ -11971,62 +10977,62 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1orientation)
 #endif
 
 #ifndef NO__1gtk_1radio_1button_1get_1group
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1button_1get_1group)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1button_1get_1group)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1radio_1button_1get_1group_FUNC);
-	rc = (jint)gtk_radio_button_get_group((GtkRadioButton *)arg0);
+	rc = (jintLong)gtk_radio_button_get_group((GtkRadioButton *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1radio_1button_1get_1group_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1radio_1button_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1button_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1button_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1radio_1button_1new_FUNC);
-	rc = (jint)gtk_radio_button_new((GSList *)arg0);
+	rc = (jintLong)gtk_radio_button_new((GSList *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1radio_1button_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1radio_1menu_1item_1get_1group
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1get_1group)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1get_1group)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1get_1group_FUNC);
-	rc = (jint)gtk_radio_menu_item_get_group((GtkRadioMenuItem *)arg0);
+	rc = (jintLong)gtk_radio_menu_item_get_group((GtkRadioMenuItem *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1get_1group_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1radio_1menu_1item_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1new_FUNC);
-	rc = (jint)gtk_radio_menu_item_new((GSList *)arg0);
+	rc = (jintLong)gtk_radio_menu_item_new((GSList *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1radio_1menu_1item_1new_1with_1label
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new_1with_1label)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new_1with_1label)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1new_1with_1label_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_radio_menu_item_new_with_label((GSList *)arg0, (const gchar *)lparg1);
+	rc = (jintLong)gtk_radio_menu_item_new_with_label((GSList *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1new_1with_1label_FUNC);
@@ -12035,12 +11041,12 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1range_1get_1adjustment
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1range_1get_1adjustment)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1range_1get_1adjustment)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1range_1get_1adjustment_FUNC);
-	rc = (jint)gtk_range_get_adjustment((GtkRange *)arg0);
+	rc = (jintLong)gtk_range_get_adjustment((GtkRange *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1range_1get_1adjustment_FUNC);
 	return rc;
 }
@@ -12048,7 +11054,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1range_1get_1adjustment)
 
 #ifndef NO__1gtk_1range_1set_1increments
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1increments)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1increments_FUNC);
 	gtk_range_set_increments((GtkRange *)arg0, arg1, arg2);
@@ -12058,7 +11064,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1increments)
 
 #ifndef NO__1gtk_1range_1set_1inverted
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1inverted)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1inverted_FUNC);
 	gtk_range_set_inverted((GtkRange *)arg0, arg1);
@@ -12068,7 +11074,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1inverted)
 
 #ifndef NO__1gtk_1range_1set_1range
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1range)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1range_FUNC);
 	gtk_range_set_range((GtkRange *)arg0, arg1, arg2);
@@ -12078,7 +11084,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1range)
 
 #ifndef NO__1gtk_1range_1set_1value
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1value)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1value_FUNC);
 	gtk_range_set_value((GtkRange *)arg0, arg1);
@@ -12101,12 +11107,12 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1rc_1style_1get_1bg_1pixmap_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1bg_1pixmap_1name)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1bg_1pixmap_1name)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC);
-	rc = (jint)gtk_rc_style_get_bg_pixmap_name((GtkRcStyle *)arg0, arg1);
+	rc = (jintLong)gtk_rc_style_get_bg_pixmap_name((GtkRcStyle *)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC);
 	return rc;
 }
@@ -12114,7 +11120,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1bg_1pixmap_1name)
 
 #ifndef NO__1gtk_1rc_1style_1get_1color_1flags
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1color_1flags)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1get_1color_1flags_FUNC);
@@ -12126,7 +11132,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1color_1flags)
 
 #ifndef NO__1gtk_1rc_1style_1set_1bg
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1bg)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1bg_FUNC);
@@ -12139,7 +11145,7 @@ fail:
 
 #ifndef NO__1gtk_1rc_1style_1set_1bg_1pixmap_1name
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1bg_1pixmap_1name)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1bg_1pixmap_1name_FUNC);
 	gtk_rc_style_set_bg_pixmap_name((GtkRcStyle *)arg0, arg1, (char *)arg2);
@@ -12149,7 +11155,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1bg_1pixmap_1name)
 
 #ifndef NO__1gtk_1rc_1style_1set_1color_1flags
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1color_1flags)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1color_1flags_FUNC);
 	gtk_rc_style_set_color_flags((GtkRcStyle *)arg0, arg1, arg2);
@@ -12159,7 +11165,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1color_1flags)
 
 #ifndef NO__1gtk_1rc_1style_1set_1fg
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1fg)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1fg_FUNC);
@@ -12172,7 +11178,7 @@ fail:
 
 #ifndef NO__1gtk_1rc_1style_1set_1text
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1text)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1text_FUNC);
@@ -12185,7 +11191,7 @@ fail:
 
 #ifndef NO__1gtk_1scale_1set_1digits
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1digits)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1scale_1set_1digits_FUNC);
 	gtk_scale_set_digits((GtkScale *)arg0, (gint)arg1);
@@ -12195,7 +11201,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1digits)
 
 #ifndef NO__1gtk_1scale_1set_1draw_1value
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1draw_1value)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1scale_1set_1draw_1value_FUNC);
 	gtk_scale_set_draw_value((GtkScale *)arg0, (gboolean)arg1);
@@ -12205,7 +11211,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1draw_1value)
 
 #ifndef NO__1gtk_1scrolled_1window_1add_1with_1viewport
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1add_1with_1viewport)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1add_1with_1viewport_FUNC);
 	gtk_scrolled_window_add_with_viewport((GtkScrolledWindow *)arg0, (GtkWidget *)arg1);
@@ -12214,12 +11220,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1add_1with_1viewport)
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1get_1hadjustment
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1hadjustment)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1hadjustment)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1hadjustment_FUNC);
-	rc = (jint)gtk_scrolled_window_get_hadjustment((GtkScrolledWindow *)arg0);
+	rc = (jintLong)gtk_scrolled_window_get_hadjustment((GtkScrolledWindow *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1hadjustment_FUNC);
 	return rc;
 }
@@ -12227,7 +11233,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1hadjustment)
 
 #ifndef NO__1gtk_1scrolled_1window_1get_1policy
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1policy)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -12244,7 +11250,7 @@ fail:
 
 #ifndef NO__1gtk_1scrolled_1window_1get_1shadow_1type
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1shadow_1type)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1shadow_1type_FUNC);
@@ -12255,24 +11261,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1shadow_1type)
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1get_1vadjustment
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1vadjustment)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1vadjustment)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1vadjustment_FUNC);
-	rc = (jint)gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)arg0);
+	rc = (jintLong)gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1vadjustment_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1new)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1new_FUNC);
-	rc = (jint)gtk_scrolled_window_new((GtkAdjustment *)arg0, (GtkAdjustment *)arg1);
+	rc = (jintLong)gtk_scrolled_window_new((GtkAdjustment *)arg0, (GtkAdjustment *)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1new_FUNC);
 	return rc;
 }
@@ -12280,7 +11286,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1new)
 
 #ifndef NO__1gtk_1scrolled_1window_1set_1placement
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1placement)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1placement_FUNC);
 	gtk_scrolled_window_set_placement((GtkScrolledWindow *)arg0, (GtkCornerType)arg1);
@@ -12290,7 +11296,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1placement)
 
 #ifndef NO__1gtk_1scrolled_1window_1set_1policy
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1policy)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1policy_FUNC);
 	gtk_scrolled_window_set_policy((GtkScrolledWindow *)arg0, (GtkPolicyType)arg1, (GtkPolicyType)arg2);
@@ -12300,7 +11306,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1policy)
 
 #ifndef NO__1gtk_1scrolled_1window_1set_1shadow_1type
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1shadow_1type)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1shadow_1type_FUNC);
 	gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)arg0, (GtkShadowType)arg1);
@@ -12310,7 +11316,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1shadow_1type)
 
 #ifndef NO__1gtk_1selection_1data_1free
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1selection_1data_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1free_FUNC);
 	gtk_selection_data_free((GtkSelectionData *)arg0);
@@ -12320,7 +11326,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1selection_1data_1free)
 
 #ifndef NO__1gtk_1selection_1data_1set
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1selection_1data_1set)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1set_FUNC);
 	gtk_selection_data_set((GtkSelectionData *)arg0, (GdkAtom)arg1, (gint)arg2, (const guchar *)arg3, (gint)arg4);
@@ -12329,72 +11335,72 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1selection_1data_1set)
 #endif
 
 #ifndef NO__1gtk_1separator_1menu_1item_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1separator_1menu_1item_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1separator_1menu_1item_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1separator_1menu_1item_1new_FUNC);
-	rc = (jint)gtk_separator_menu_item_new();
+	rc = (jintLong)gtk_separator_menu_item_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1separator_1menu_1item_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1set_1locale
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1set_1locale)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1set_1locale)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1set_1locale_FUNC);
-	rc = (jint)gtk_set_locale();
+	rc = (jintLong)gtk_set_locale();
 	OS_NATIVE_EXIT(env, that, _1gtk_1set_1locale_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1settings_1get_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1settings_1get_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1settings_1get_1default)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1settings_1get_1default_FUNC);
-	rc = (jint)gtk_settings_get_default();
+	rc = (jintLong)gtk_settings_get_default();
 	OS_NATIVE_EXIT(env, that, _1gtk_1settings_1get_1default_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1socket_1get_1id
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1socket_1get_1id)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1socket_1get_1id)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1socket_1get_1id_FUNC);
-	rc = (jint)gtk_socket_get_id((GtkSocket *)arg0);
+	rc = (jintLong)gtk_socket_get_id((GtkSocket *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1socket_1get_1id_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1socket_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1socket_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1socket_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1socket_1new_FUNC);
-	rc = (jint)gtk_socket_new();
+	rc = (jintLong)gtk_socket_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1socket_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1get_1adjustment
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1adjustment)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1adjustment)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1get_1adjustment_FUNC);
-	rc = (jint)gtk_spin_button_get_adjustment((GtkSpinButton*)arg0);
+	rc = (jintLong)gtk_spin_button_get_adjustment((GtkSpinButton*)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1get_1adjustment_FUNC);
 	return rc;
 }
@@ -12402,7 +11408,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1adjustment)
 
 #ifndef NO__1gtk_1spin_1button_1get_1digits
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1digits)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1get_1digits_FUNC);
@@ -12413,12 +11419,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1digits)
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1new)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1spin_1button_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1new_FUNC);
-	rc = (jint)gtk_spin_button_new((GtkAdjustment *)arg0, arg1, arg2);
+	rc = (jintLong)gtk_spin_button_new((GtkAdjustment *)arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1new_FUNC);
 	return rc;
 }
@@ -12426,7 +11432,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1new)
 
 #ifndef NO__1gtk_1spin_1button_1set_1digits
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1digits)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1digits_FUNC);
 	gtk_spin_button_set_digits((GtkSpinButton*)arg0, arg1);
@@ -12436,7 +11442,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1digits)
 
 #ifndef NO__1gtk_1spin_1button_1set_1increments
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1increments)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1increments_FUNC);
 	gtk_spin_button_set_increments((GtkSpinButton*)arg0, arg1, arg2);
@@ -12446,7 +11452,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1increments)
 
 #ifndef NO__1gtk_1spin_1button_1set_1range
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1range)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1range_FUNC);
 	gtk_spin_button_set_range((GtkSpinButton*)arg0, arg1, arg2);
@@ -12456,7 +11462,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1range)
 
 #ifndef NO__1gtk_1spin_1button_1set_1value
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1value)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1value_FUNC);
 	gtk_spin_button_set_value((GtkSpinButton*)arg0, arg1);
@@ -12466,7 +11472,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1value)
 
 #ifndef NO__1gtk_1spin_1button_1set_1wrap
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1wrap)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1wrap_FUNC);
 	gtk_spin_button_set_wrap((GtkSpinButton*)arg0, arg1);
@@ -12476,7 +11482,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1wrap)
 
 #ifndef NO__1gtk_1spin_1button_1update
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1update)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1update_FUNC);
 	gtk_spin_button_update((GtkSpinButton*)arg0);
@@ -12486,7 +11492,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1update)
 
 #ifndef NO__1gtk_1style_1get_1base
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1base)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1base_FUNC);
@@ -12500,7 +11506,7 @@ fail:
 
 #ifndef NO__1gtk_1style_1get_1bg
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1bg)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1bg_FUNC);
@@ -12514,21 +11520,21 @@ fail:
 
 #ifndef NO__1gtk_1style_1get_1bg_1gc
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1bg_1gc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1bg_1gc_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_style_get_bg_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1bg_1gc_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1black
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1black)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkColor _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1black_FUNC);
@@ -12542,21 +11548,21 @@ fail:
 
 #ifndef NO__1gtk_1style_1get_1black_1gc
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1black_1gc)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1black_1gc_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_style_get_black_gc((GtkStyle *)arg0, (GdkGC **)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1black_1gc_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1dark
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1dark)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1dark_FUNC);
@@ -12570,21 +11576,21 @@ fail:
 
 #ifndef NO__1gtk_1style_1get_1dark_1gc
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1dark_1gc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1dark_1gc_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_style_get_dark_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1dark_1gc_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1fg
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1fg)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1fg_FUNC);
@@ -12598,25 +11604,25 @@ fail:
 
 #ifndef NO__1gtk_1style_1get_1fg_1gc
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1fg_1gc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1fg_1gc_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_style_get_fg_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1fg_1gc_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1font_1desc
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1font_1desc)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1style_1get_1font_1desc)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1font_1desc_FUNC);
-	rc = (jint)gtk_style_get_font_desc((GtkStyle *)arg0);
+	rc = (jintLong)gtk_style_get_font_desc((GtkStyle *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1font_1desc_FUNC);
 	return rc;
 }
@@ -12624,7 +11630,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1font_1desc)
 
 #ifndef NO__1gtk_1style_1get_1light
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1light)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1light_FUNC);
@@ -12638,35 +11644,35 @@ fail:
 
 #ifndef NO__1gtk_1style_1get_1light_1gc
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1light_1gc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1light_1gc_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_style_get_light_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1light_1gc_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1mid_1gc
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1mid_1gc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1mid_1gc_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_style_get_mid_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1mid_1gc_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1text
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1text)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1text_FUNC);
@@ -12680,49 +11686,49 @@ fail:
 
 #ifndef NO__1gtk_1style_1get_1text_1aa_1gc
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1text_1aa_1gc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1text_1aa_1gc_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_style_get_text_aa_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1text_1aa_1gc_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1text_1gc
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1text_1gc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1text_1gc_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_style_get_text_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1text_1gc_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1white_1gc
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1white_1gc)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1white_1gc_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_style_get_white_gc((GtkStyle *)arg0, (GdkGC **)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1white_1gc_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1xthickness
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1xthickness)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1xthickness_FUNC);
@@ -12734,7 +11740,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1xthickness)
 
 #ifndef NO__1gtk_1style_1get_1ythickness
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1ythickness)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1ythickness_FUNC);
@@ -12745,14 +11751,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1ythickness)
 #endif
 
 #ifndef NO__1gtk_1style_1render_1icon
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1render_1icon)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jbyteArray arg6)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1style_1render_1icon)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jbyteArray arg6)
 {
 	jbyte *lparg6=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1style_1render_1icon_FUNC);
 	if (arg6) if ((lparg6 = (*env)->GetByteArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_style_render_icon((GtkStyle *)arg0, (GtkIconSource *)arg1, arg2, arg3, arg4, (GtkWidget *)arg5, (const gchar *)lparg6);
+	rc = (jintLong)gtk_style_render_icon((GtkStyle *)arg0, (GtkIconSource *)arg1, arg2, arg3, arg4, (GtkWidget *)arg5, (const gchar *)lparg6);
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseByteArrayElements(env, arg6, lparg6, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1style_1render_1icon_FUNC);
@@ -12761,12 +11767,12 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1target_1list_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1target_1list_1new)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1target_1list_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1target_1list_1new_FUNC);
-	rc = (jint)gtk_target_list_new((const GtkTargetEntry *)arg0, (guint)arg1);
+	rc = (jintLong)gtk_target_list_new((const GtkTargetEntry *)arg0, (guint)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1target_1list_1new_FUNC);
 	return rc;
 }
@@ -12774,7 +11780,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1target_1list_1new)
 
 #ifndef NO__1gtk_1target_1list_1unref
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1target_1list_1unref)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1target_1list_1unref_FUNC);
 	gtk_target_list_unref((GtkTargetList *)arg0);
@@ -12784,7 +11790,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1target_1list_1unref)
 
 #ifndef NO__1gtk_1text_1buffer_1copy_1clipboard
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1copy_1clipboard)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1copy_1clipboard_FUNC);
 	gtk_text_buffer_copy_clipboard((GtkTextBuffer *)arg0, (GtkClipboard *)arg1);
@@ -12794,7 +11800,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1copy_1clipboard)
 
 #ifndef NO__1gtk_1text_1buffer_1cut_1clipboard
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1cut_1clipboard)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1cut_1clipboard_FUNC);
 	gtk_text_buffer_cut_clipboard((GtkTextBuffer *)arg0, (GtkClipboard *)arg1, (gboolean)arg2);
@@ -12804,7 +11810,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1cut_1clipboard)
 
 #ifndef NO__1gtk_1text_1buffer_1delete
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1delete)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
@@ -12821,7 +11827,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1buffer_1get_1bounds
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1bounds)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
@@ -12838,7 +11844,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1buffer_1get_1char_1count
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1char_1count)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1char_1count_FUNC);
@@ -12850,7 +11856,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1char_1count)
 
 #ifndef NO__1gtk_1text_1buffer_1get_1end_1iter
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1end_1iter)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1end_1iter_FUNC);
@@ -12863,12 +11869,12 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1insert
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1insert)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1insert)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1insert_FUNC);
-	rc = (jint)gtk_text_buffer_get_insert((GtkTextBuffer *)arg0);
+	rc = (jintLong)gtk_text_buffer_get_insert((GtkTextBuffer *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1insert_FUNC);
 	return rc;
 }
@@ -12876,7 +11882,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1insert)
 
 #ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1line
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1line)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1line_FUNC);
@@ -12890,7 +11896,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1mark
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1mark)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1mark_FUNC);
@@ -12904,7 +11910,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1offset
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1offset)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1offset_FUNC);
@@ -12918,7 +11924,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1buffer_1get_1line_1count
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1line_1count)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1line_1count_FUNC);
@@ -12929,12 +11935,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1line_1count)
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1selection_1bound
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1selection_1bound_FUNC);
-	rc = (jint)gtk_text_buffer_get_selection_bound((GtkTextBuffer *)arg0);
+	rc = (jintLong)gtk_text_buffer_get_selection_bound((GtkTextBuffer *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1selection_1bound_FUNC);
 	return rc;
 }
@@ -12942,7 +11948,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound)
 
 #ifndef NO__1gtk_1text_1buffer_1get_1selection_1bounds
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bounds)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
@@ -12960,16 +11966,16 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1text
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1text)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jboolean arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1text)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jboolean arg3)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1text_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_text_buffer_get_text((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextIter *)lparg2, (gboolean)arg3);
+	rc = (jintLong)gtk_text_buffer_get_text((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextIter *)lparg2, (gboolean)arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
@@ -12978,40 +11984,62 @@ fail:
 }
 #endif
 
-#ifndef NO__1gtk_1text_1buffer_1insert__II_3BI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__II_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+#if (!defined(NO__1gtk_1text_1buffer_1insert__II_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1text_1buffer_1insert__JJ_3BI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__II_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__JJ_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3)
+#endif
 {
 	jbyte *lparg2=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__II_3BI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_text_buffer_insert((GtkTextBuffer *)arg0, (GtkTextIter *)arg1, (const gchar *)lparg2, (gint)arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__II_3BI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1gtk_1text_1buffer_1insert__I_3B_3BI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__I_3B_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
+#if (!defined(NO__1gtk_1text_1buffer_1insert__I_3B_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1text_1buffer_1insert__J_3B_3BI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__I_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__J_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
+#endif
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_text_buffer_insert((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (const gchar *)lparg2, (gint)arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1move_1mark
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1move_1mark)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2)
 {
 	jbyte *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1move_1mark_FUNC);
@@ -13025,7 +12053,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1buffer_1paste_1clipboard
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1paste_1clipboard)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jboolean arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jboolean arg3)
 {
 	jbyte *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1paste_1clipboard_FUNC);
@@ -13039,7 +12067,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1buffer_1place_1cursor
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1place_1cursor)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1place_1cursor_FUNC);
@@ -13053,7 +12081,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1buffer_1set_1text
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1set_1text)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1set_1text_FUNC);
@@ -13099,7 +12127,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1view_1buffer_1to_1window_1coords
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1buffer_1to_1window_1coords)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
 {
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
@@ -13115,12 +12143,12 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1text_1view_1get_1buffer
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1buffer)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1buffer)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1buffer_FUNC);
-	rc = (jint)gtk_text_view_get_buffer((GtkTextView *)arg0);
+	rc = (jintLong)gtk_text_view_get_buffer((GtkTextView *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1buffer_FUNC);
 	return rc;
 }
@@ -13128,7 +12156,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1buffer)
 
 #ifndef NO__1gtk_1text_1view_1get_1editable
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1editable)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1editable_FUNC);
@@ -13140,7 +12168,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1editable)
 
 #ifndef NO__1gtk_1text_1view_1get_1iter_1at_1location
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1iter_1at_1location)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1iter_1at_1location_FUNC);
@@ -13154,7 +12182,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1view_1get_1iter_1location
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1iter_1location)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2)
 {
 	jbyte *lparg1=NULL;
 	GdkRectangle _arg2, *lparg2=NULL;
@@ -13171,7 +12199,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1view_1get_1line_1at_1y
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1line_1at_1y)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintArray arg3)
 {
 	jbyte *lparg1=NULL;
 	jint *lparg3=NULL;
@@ -13188,7 +12216,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1view_1get_1visible_1rect
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1visible_1rect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1visible_1rect_FUNC);
@@ -13201,24 +12229,24 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1text_1view_1get_1window
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1window)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1window)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1window_FUNC);
-	rc = (jint)gtk_text_view_get_window((GtkTextView *)arg0, (GtkTextWindowType)arg1);
+	rc = (jintLong)gtk_text_view_get_window((GtkTextView *)arg0, (GtkTextWindowType)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1window_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1view_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1new_FUNC);
-	rc = (jint)gtk_text_view_new();
+	rc = (jintLong)gtk_text_view_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1new_FUNC);
 	return rc;
 }
@@ -13226,7 +12254,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1new)
 
 #ifndef NO__1gtk_1text_1view_1scroll_1mark_1onscreen
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1mark_1onscreen)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1scroll_1mark_1onscreen_FUNC);
 	gtk_text_view_scroll_mark_onscreen((GtkTextView *)arg0, (GtkTextMark *)arg1);
@@ -13236,7 +12264,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1mark_1onscreen)
 
 #ifndef NO__1gtk_1text_1view_1scroll_1to_1iter
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1to_1iter)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5)
 {
 	jbyte *lparg1=NULL;
 	jboolean rc = 0;
@@ -13252,7 +12280,7 @@ fail:
 
 #ifndef NO__1gtk_1text_1view_1set_1editable
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1editable)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1editable_FUNC);
 	gtk_text_view_set_editable((GtkTextView *)arg0, (gboolean)arg1);
@@ -13262,7 +12290,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1editable)
 
 #ifndef NO__1gtk_1text_1view_1set_1justification
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1justification)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1justification_FUNC);
 	gtk_text_view_set_justification((GtkTextView *)arg0, arg1);
@@ -13272,7 +12300,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1justification)
 
 #ifndef NO__1gtk_1text_1view_1set_1tabs
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1tabs)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1tabs_FUNC);
 	gtk_text_view_set_tabs((GtkTextView *)arg0, (PangoTabArray *)arg1);
@@ -13282,7 +12310,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1tabs)
 
 #ifndef NO__1gtk_1text_1view_1set_1wrap_1mode
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1wrap_1mode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1wrap_1mode_FUNC);
 	gtk_text_view_set_wrap_mode((GtkTextView *)arg0, arg1);
@@ -13292,7 +12320,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1wrap_1mode)
 
 #ifndef NO__1gtk_1text_1view_1window_1to_1buffer_1coords
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1window_1to_1buffer_1coords)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
 {
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
@@ -13309,7 +12337,7 @@ fail:
 
 #ifndef NO__1gtk_1timeout_1add
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1timeout_1add)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1timeout_1add_FUNC);
@@ -13331,7 +12359,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1timeout_1remove)
 
 #ifndef NO__1gtk_1toggle_1button_1get_1active
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1toggle_1button_1get_1active)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1get_1active_FUNC);
@@ -13343,7 +12371,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1toggle_1button_1get_1active)
 
 #ifndef NO__1gtk_1toggle_1button_1get_1inconsistent
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1toggle_1button_1get_1inconsistent)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1get_1inconsistent_FUNC);
@@ -13354,12 +12382,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1toggle_1button_1get_1inconsistent)
 #endif
 
 #ifndef NO__1gtk_1toggle_1button_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1toggle_1button_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1toggle_1button_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1new_FUNC);
-	rc = (jint)gtk_toggle_button_new();
+	rc = (jintLong)gtk_toggle_button_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1new_FUNC);
 	return rc;
 }
@@ -13367,7 +12395,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1toggle_1button_1new)
 
 #ifndef NO__1gtk_1toggle_1button_1set_1active
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1active)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1active_FUNC);
 	gtk_toggle_button_set_active((GtkToggleButton *)arg0, (gboolean)arg1);
@@ -13377,7 +12405,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1active)
 
 #ifndef NO__1gtk_1toggle_1button_1set_1inconsistent
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1inconsistent)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1inconsistent_FUNC);
 	gtk_toggle_button_set_inconsistent((GtkToggleButton *)arg0, (gboolean)arg1);
@@ -13387,7 +12415,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1inconsistent)
 
 #ifndef NO__1gtk_1toggle_1button_1set_1mode
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1mode)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1mode_FUNC);
 	gtk_toggle_button_set_mode((GtkToggleButton *)arg0, (gboolean)arg1);
@@ -13397,7 +12425,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1mode)
 
 #ifndef NO__1gtk_1toolbar_1insert_1widget
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1insert_1widget)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
@@ -13413,12 +12441,12 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1toolbar_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1toolbar_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1toolbar_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1toolbar_1new_FUNC);
-	rc = (jint)gtk_toolbar_new();
+	rc = (jintLong)gtk_toolbar_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1toolbar_1new_FUNC);
 	return rc;
 }
@@ -13426,7 +12454,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1toolbar_1new)
 
 #ifndef NO__1gtk_1toolbar_1set_1orientation
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1set_1orientation)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1toolbar_1set_1orientation_FUNC);
 	gtk_toolbar_set_orientation((GtkToolbar *)arg0, (GtkOrientation)arg1);
@@ -13436,24 +12464,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1set_1orientation)
 
 #ifndef NO__1gtk_1tooltip_1trigger_1tooltip_1query
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltip_1trigger_1tooltip_1query)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tooltip_1trigger_1tooltip_1query_FUNC);
 /*
 	gtk_tooltip_trigger_tooltip_query((GdkDisplay*)arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GdkDisplay*);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_tooltip_trigger_tooltip_query_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_tooltip_trigger_tooltip_query");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GdkDisplay*)arg0);
+		LOAD_FUNCTION(fp, gtk_tooltip_trigger_tooltip_query)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkDisplay*))fp)((GdkDisplay*)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1tooltip_1trigger_1tooltip_1query_FUNC);
@@ -13461,12 +12481,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltip_1trigger_1tooltip_1query)
 #endif
 
 #ifndef NO__1gtk_1tooltips_1data_1get
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tooltips_1data_1get)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tooltips_1data_1get)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1data_1get_FUNC);
-	rc = (jint)gtk_tooltips_data_get((GtkWidget *)arg0);
+	rc = (jintLong)gtk_tooltips_data_get((GtkWidget *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tooltips_1data_1get_FUNC);
 	return rc;
 }
@@ -13474,7 +12494,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tooltips_1data_1get)
 
 #ifndef NO__1gtk_1tooltips_1disable
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1disable)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1disable_FUNC);
 	gtk_tooltips_disable((GtkTooltips *)arg0);
@@ -13484,7 +12504,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1disable)
 
 #ifndef NO__1gtk_1tooltips_1enable
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1enable)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1enable_FUNC);
 	gtk_tooltips_enable((GtkTooltips *)arg0);
@@ -13494,7 +12514,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1enable)
 
 #ifndef NO__1gtk_1tooltips_1force_1window
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1force_1window)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1force_1window_FUNC);
 	gtk_tooltips_force_window((GtkTooltips *)arg0);
@@ -13503,12 +12523,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1force_1window)
 #endif
 
 #ifndef NO__1gtk_1tooltips_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tooltips_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tooltips_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1new_FUNC);
-	rc = (jint)gtk_tooltips_new();
+	rc = (jintLong)gtk_tooltips_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1tooltips_1new_FUNC);
 	return rc;
 }
@@ -13516,7 +12536,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tooltips_1new)
 
 #ifndef NO__1gtk_1tooltips_1set_1tip
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1set_1tip)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3)
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
@@ -13531,37 +12551,59 @@ fail:
 }
 #endif
 
-#ifndef NO__1gtk_1tree_1model_1get__III_3II
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__III_3II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1model_1get__III_3II) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1model_1get__JJI_3IJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__III_3II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__JJI_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jintLong arg4)
+#endif
 {
 	jint *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__III_3II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__JJI_3IJ_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gtk_tree_model_get((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__III_3II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__JJI_3IJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1gtk_1tree_1model_1get__III_3JI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__III_3JI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlongArray arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1model_1get__III_3JI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1model_1get__JJI_3JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__III_3JI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlongArray arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__JJI_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlongArray arg3, jintLong arg4)
+#endif
 {
 	jlong *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__III_3JI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__JJI_3JJ_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gtk_tree_model_get((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__III_3JI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__JJI_3JJ_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1model_1get_1iter
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1iter)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1iter_FUNC);
@@ -13573,7 +12615,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1iter)
 
 #ifndef NO__1gtk_1tree_1model_1get_1iter_1first
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1iter_1first)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1iter_1first_FUNC);
@@ -13585,7 +12627,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1iter_1first)
 
 #ifndef NO__1gtk_1tree_1model_1get_1n_1columns
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1n_1columns)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1n_1columns_FUNC);
@@ -13596,24 +12638,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1n_1columns)
 #endif
 
 #ifndef NO__1gtk_1tree_1model_1get_1path
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1path)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1path)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1path_FUNC);
-	rc = (jint)gtk_tree_model_get_path((GtkTreeModel *)arg0, (GtkTreeIter *)arg1);
+	rc = (jintLong)gtk_tree_model_get_path((GtkTreeModel *)arg0, (GtkTreeIter *)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1path_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1model_1get_1type
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1type)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1type)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1type_FUNC);
-	rc = (jint)gtk_tree_model_get_type();
+	rc = (jintLong)gtk_tree_model_get_type();
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1type_FUNC);
 	return rc;
 }
@@ -13621,7 +12663,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1type)
 
 #ifndef NO__1gtk_1tree_1model_1iter_1children
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1children)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1children_FUNC);
@@ -13633,7 +12675,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1children)
 
 #ifndef NO__1gtk_1tree_1model_1iter_1n_1children
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1n_1children)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1n_1children_FUNC);
@@ -13645,7 +12687,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1n_1children)
 
 #ifndef NO__1gtk_1tree_1model_1iter_1next
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1next)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1next_FUNC);
@@ -13657,7 +12699,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1next)
 
 #ifndef NO__1gtk_1tree_1model_1iter_1nth_1child
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1nth_1child)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1nth_1child_FUNC);
@@ -13669,7 +12711,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1nth_1child)
 
 #ifndef NO__1gtk_1tree_1path_1append_1index
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1append_1index)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1append_1index_FUNC);
 	gtk_tree_path_append_index((GtkTreePath *)arg0, arg1);
@@ -13678,12 +12720,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1append_1index)
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1compare
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1compare)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1compare)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1compare_FUNC);
-	rc = (jint)gtk_tree_path_compare((const GtkTreePath *)arg0, (const GtkTreePath *)arg1);
+	rc = (jintLong)gtk_tree_path_compare((const GtkTreePath *)arg0, (const GtkTreePath *)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1compare_FUNC);
 	return rc;
 }
@@ -13691,7 +12733,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1compare)
 
 #ifndef NO__1gtk_1tree_1path_1down
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1down)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1down_FUNC);
 	gtk_tree_path_down((GtkTreePath *)arg0);
@@ -13701,7 +12743,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1down)
 
 #ifndef NO__1gtk_1tree_1path_1free
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1free_FUNC);
 	gtk_tree_path_free((GtkTreePath *)arg0);
@@ -13711,7 +12753,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1free)
 
 #ifndef NO__1gtk_1tree_1path_1get_1depth
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1depth)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1get_1depth_FUNC);
@@ -13722,62 +12764,73 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1depth)
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1get_1indices
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1indices)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1indices)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1get_1indices_FUNC);
-	rc = (jint)gtk_tree_path_get_indices((GtkTreePath *)arg0);
+	rc = (jintLong)gtk_tree_path_get_indices((GtkTreePath *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1get_1indices_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_FUNC);
-	rc = (jint)gtk_tree_path_new();
+	rc = (jintLong)gtk_tree_path_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1new_1first
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1first)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1first)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1first_FUNC);
-	rc = (jint)gtk_tree_path_new_first();
+	rc = (jintLong)gtk_tree_path_new_first();
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1first_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO__1gtk_1tree_1path_1new_1from_1string__I
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string__I)
-	(JNIEnv *env, jclass that, jint arg0)
+#if (!defined(NO__1gtk_1tree_1path_1new_1from_1string__I) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1path_1new_1from_1string__J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string__I)(JNIEnv *env, jclass that, jintLong arg0)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string__J)(JNIEnv *env, jclass that, jintLong arg0)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string__I_FUNC);
-	rc = (jint)gtk_tree_path_new_from_string((const gchar *)arg0);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string__J_FUNC);
+#endif
+	rc = (jintLong)gtk_tree_path_new_from_string((const gchar *)arg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string__I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string__J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1new_1from_1string___3B
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string___3B)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string___3B)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string___3B_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_tree_path_new_from_string((const gchar *)lparg0);
+	rc = (jintLong)gtk_tree_path_new_from_string((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string___3B_FUNC);
@@ -13787,7 +12840,7 @@ fail:
 
 #ifndef NO__1gtk_1tree_1path_1next
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1next)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1next_FUNC);
 	gtk_tree_path_next((GtkTreePath *)arg0);
@@ -13797,7 +12850,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1next)
 
 #ifndef NO__1gtk_1tree_1path_1prev
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1path_1prev)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1prev_FUNC);
@@ -13809,7 +12862,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1path_1prev)
 
 #ifndef NO__1gtk_1tree_1path_1up
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1path_1up)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1up_FUNC);
@@ -13821,7 +12874,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1path_1up)
 
 #ifndef NO__1gtk_1tree_1selection_1count_1selected_1rows
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1count_1selected_1rows_FUNC);
@@ -13829,18 +12882,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows)
 	rc = (jint)gtk_tree_selection_count_selected_rows((GtkTreeSelection *)arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(GtkTreeSelection *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_tree_selection_count_selected_rows_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_tree_selection_count_selected_rows");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((GtkTreeSelection *)arg0);
+		LOAD_FUNCTION(fp, gtk_tree_selection_count_selected_rows)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GtkTreeSelection *))fp)((GtkTreeSelection *)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1count_1selected_1rows_FUNC);
@@ -13850,48 +12894,39 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows)
 
 #ifndef NO__1gtk_1tree_1selection_1get_1selected
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1selected)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLong arg2)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1selected_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jboolean)gtk_tree_selection_get_selected((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1, (GtkTreeIter *)arg2);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1selected_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1get_1selected_1rows
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
-	jint rc = 0;
+	jintLong *lparg1=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)gtk_tree_selection_get_selected_rows((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
+	rc = (jintLong)gtk_tree_selection_get_selected_rows((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(GtkTreeSelection *, GtkTreeModel **);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_tree_selection_get_selected_rows_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_tree_selection_get_selected_rows");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
+		LOAD_FUNCTION(fp, gtk_tree_selection_get_selected_rows)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkTreeSelection *, GtkTreeModel **))fp)((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
 		}
 	}
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC);
 	return rc;
 }
@@ -13899,7 +12934,7 @@ fail:
 
 #ifndef NO__1gtk_1tree_1selection_1path_1is_1selected
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1selection_1path_1is_1selected)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1path_1is_1selected_FUNC);
@@ -13911,7 +12946,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1selection_1path_1is_1selected)
 
 #ifndef NO__1gtk_1tree_1selection_1select_1all
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1all)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1all_FUNC);
 	gtk_tree_selection_select_all((GtkTreeSelection *)arg0);
@@ -13921,7 +12956,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1all)
 
 #ifndef NO__1gtk_1tree_1selection_1select_1iter
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1iter)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1iter_FUNC);
 	gtk_tree_selection_select_iter((GtkTreeSelection *)arg0, (GtkTreeIter *)arg1);
@@ -13931,7 +12966,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1iter)
 
 #ifndef NO__1gtk_1tree_1selection_1selected_1foreach
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1selected_1foreach)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1selected_1foreach_FUNC);
 	gtk_tree_selection_selected_foreach((GtkTreeSelection *)arg0, (GtkTreeSelectionForeachFunc)arg1, (gpointer)arg2);
@@ -13941,7 +12976,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1selected_1foreach)
 
 #ifndef NO__1gtk_1tree_1selection_1set_1mode
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1set_1mode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1set_1mode_FUNC);
 	gtk_tree_selection_set_mode((GtkTreeSelection *)arg0, (GtkSelectionMode)arg1);
@@ -13951,7 +12986,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1set_1mode)
 
 #ifndef NO__1gtk_1tree_1selection_1unselect_1all
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1all)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1all_FUNC);
 	gtk_tree_selection_unselect_all((GtkTreeSelection *)arg0);
@@ -13961,7 +12996,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1all)
 
 #ifndef NO__1gtk_1tree_1selection_1unselect_1iter
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1iter)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1iter_FUNC);
 	gtk_tree_selection_unselect_iter((GtkTreeSelection *)arg0, (GtkTreeIter *)arg1);
@@ -13971,7 +13006,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1iter)
 
 #ifndef NO__1gtk_1tree_1store_1append
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1append)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1append_FUNC);
 	gtk_tree_store_append((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, (GtkTreeIter *)arg2);
@@ -13981,7 +13016,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1append)
 
 #ifndef NO__1gtk_1tree_1store_1clear
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1clear)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1clear_FUNC);
 	gtk_tree_store_clear((GtkTreeStore *)arg0);
@@ -13991,7 +13026,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1clear)
 
 #ifndef NO__1gtk_1tree_1store_1insert
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1insert)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1insert_FUNC);
 	gtk_tree_store_insert((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, (GtkTreeIter *)arg2, (gint)arg3);
@@ -14000,16 +13035,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1insert)
 #endif
 
 #ifndef NO__1gtk_1tree_1store_1newv
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1store_1newv)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1store_1newv)
+	(JNIEnv *env, jclass that, jint arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
-	jint rc = 0;
+	jintLong *lparg1=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1newv_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_tree_store_newv(arg0, (GType *)lparg1);
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)gtk_tree_store_newv(arg0, (GType *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1newv_FUNC);
 	return rc;
 }
@@ -14017,7 +13052,7 @@ fail:
 
 #ifndef NO__1gtk_1tree_1store_1remove
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1remove)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1remove_FUNC);
 	gtk_tree_store_remove((GtkTreeStore *)arg0, (GtkTreeIter *)arg1);
@@ -14025,66 +13060,121 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1remove)
 }
 #endif
 
-#ifndef NO__1gtk_1tree_1store_1set__IIIII
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1store_1set__IIIII) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJIIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJIIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIIJ_FUNC);
+#endif
 	gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIIJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1gtk_1tree_1store_1set__IIIJI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIJI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1store_1set__IIIJI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJIJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJIJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jintLong arg4)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIJI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIJJ_FUNC);
+#endif
 	gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIJI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIJJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4)
+#endif
 {
 	GdkColor _arg3, *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
 	gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1gtk_1tree_1store_1set__IIIZI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIZI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1store_1set__IIIZI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJIZJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJIZJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jintLong arg4)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIZI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIZJ_FUNC);
+#endif
 	gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIZI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIZJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1gtk_1tree_1store_1set__III_3BI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__III_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1store_1set__III_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJI_3BJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__III_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJI_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintLong arg4)
+#endif
 {
 	jbyte *lparg3=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__III_3BI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJI_3BJ_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__III_3BI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJI_3BJ_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1collapse_1row
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1collapse_1row)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1collapse_1row_FUNC);
@@ -14096,7 +13186,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1collapse_1row)
 
 #ifndef NO__1gtk_1tree_1view_1column_1add_1attribute
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1add_1attribute)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3)
 {
 	jbyte *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1add_1attribute_FUNC);
@@ -14110,7 +13200,7 @@ fail:
 
 #ifndef NO__1gtk_1tree_1view_1column_1cell_1get_1position
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1position)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintArray arg3)
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
@@ -14122,18 +13212,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1posit
 	rc = (jboolean)gtk_tree_view_column_cell_get_position((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(GtkTreeViewColumn *, GtkCellRenderer *, gint *, gint *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_tree_view_column_cell_get_position_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_tree_view_column_cell_get_position");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3);
+		LOAD_FUNCTION(fp, gtk_tree_view_column_cell_get_position)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkTreeViewColumn *, GtkCellRenderer *, gint *, gint *))fp)((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3);
 		}
 	}
 fail:
@@ -14146,7 +13227,7 @@ fail:
 
 #ifndef NO__1gtk_1tree_1view_1column_1cell_1get_1size
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1size)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -14172,7 +13253,7 @@ fail:
 
 #ifndef NO__1gtk_1tree_1view_1column_1cell_1set_1cell_1data
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1set_1cell_1data)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jboolean arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3, jboolean arg4)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1cell_1set_1cell_1data_FUNC);
 	gtk_tree_view_column_cell_set_cell_data((GtkTreeViewColumn *)arg0, (GtkTreeModel *)arg1, (GtkTreeIter *)arg2, arg3, arg4);
@@ -14182,7 +13263,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1set_1cell_1dat
 
 #ifndef NO__1gtk_1tree_1view_1column_1clear
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1clear)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1clear_FUNC);
 	gtk_tree_view_column_clear((GtkTreeViewColumn *)arg0);
@@ -14191,12 +13272,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1clear)
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1cell_1renderers
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1cell_1renderers)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1cell_1renderers)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1cell_1renderers_FUNC);
-	rc = (jint)gtk_tree_view_column_get_cell_renderers((GtkTreeViewColumn *)arg0);
+	rc = (jintLong)gtk_tree_view_column_get_cell_renderers((GtkTreeViewColumn *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1cell_1renderers_FUNC);
 	return rc;
 }
@@ -14204,7 +13285,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1cell_1renderers
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1fixed_1width
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1fixed_1width)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1fixed_1width_FUNC);
@@ -14216,7 +13297,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1fixed_1width)
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1reorderable
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1reorderable)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1reorderable_FUNC);
@@ -14228,7 +13309,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1reorderable
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1resizable
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1resizable)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1resizable_FUNC);
@@ -14240,7 +13321,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1resizable)
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1sizing
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sizing)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1sizing_FUNC);
@@ -14252,7 +13333,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sizing)
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1sort_1indicator
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sort_1indicator)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1sort_1indicator_FUNC);
@@ -14264,7 +13345,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sort_1indic
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1sort_1order
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sort_1order)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1sort_1order_FUNC);
@@ -14276,7 +13357,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sort_1order)
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1spacing
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1spacing)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1spacing_FUNC);
@@ -14288,7 +13369,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1spacing)
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1visible
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1visible)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1visible_FUNC);
@@ -14300,7 +13381,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1visible)
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1width
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1width)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1width_FUNC);
@@ -14311,12 +13392,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1width)
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1new_FUNC);
-	rc = (jint)gtk_tree_view_column_new();
+	rc = (jintLong)gtk_tree_view_column_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1new_FUNC);
 	return rc;
 }
@@ -14324,7 +13405,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1new)
 
 #ifndef NO__1gtk_1tree_1view_1column_1pack_1end
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1pack_1end)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1pack_1end_FUNC);
 	gtk_tree_view_column_pack_end((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gboolean)arg2);
@@ -14334,7 +13415,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1pack_1end)
 
 #ifndef NO__1gtk_1tree_1view_1column_1pack_1start
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1pack_1start)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1pack_1start_FUNC);
 	gtk_tree_view_column_pack_start((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gboolean)arg2);
@@ -14344,7 +13425,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1pack_1start)
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1alignment
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1alignment)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1alignment_FUNC);
 	gtk_tree_view_column_set_alignment((GtkTreeViewColumn *)arg0, arg1);
@@ -14354,7 +13435,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1alignment)
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1cell_1data_1func
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1cell_1data_1func)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1cell_1data_1func_FUNC);
 	gtk_tree_view_column_set_cell_data_func((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (GtkTreeCellDataFunc)arg2, (gpointer)arg3, (GtkDestroyNotify)arg4);
@@ -14364,7 +13445,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1cell_1data_1fun
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1clickable
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1clickable)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1clickable_FUNC);
 	gtk_tree_view_column_set_clickable((GtkTreeViewColumn *)arg0, (gboolean)arg1);
@@ -14374,7 +13455,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1clickable)
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1fixed_1width
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1fixed_1width)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1fixed_1width_FUNC);
 	gtk_tree_view_column_set_fixed_width((GtkTreeViewColumn *)arg0, (gint)arg1);
@@ -14384,7 +13465,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1fixed_1width)
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1min_1width
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1min_1width)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1min_1width_FUNC);
 	gtk_tree_view_column_set_min_width((GtkTreeViewColumn *)arg0, (gint)arg1);
@@ -14394,7 +13475,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1min_1width)
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1reorderable
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1reorderable)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1reorderable_FUNC);
 	gtk_tree_view_column_set_reorderable((GtkTreeViewColumn *)arg0, (gboolean)arg1);
@@ -14404,7 +13485,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1reorderable)
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1resizable
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1resizable)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1resizable_FUNC);
 	gtk_tree_view_column_set_resizable((GtkTreeViewColumn *)arg0, (gboolean)arg1);
@@ -14414,7 +13495,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1resizable)
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1sizing
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sizing)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sizing_FUNC);
 	gtk_tree_view_column_set_sizing((GtkTreeViewColumn *)arg0, (GtkTreeViewColumnSizing)arg1);
@@ -14424,7 +13505,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sizing)
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1sort_1indicator
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1indicator)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sort_1indicator_FUNC);
 	gtk_tree_view_column_set_sort_indicator((GtkTreeViewColumn *)arg0, (gboolean)arg1);
@@ -14434,7 +13515,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1indicator
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1sort_1order
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1order)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sort_1order_FUNC);
 	gtk_tree_view_column_set_sort_order((GtkTreeViewColumn *)arg0, (GtkSortType)arg1);
@@ -14444,7 +13525,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1order)
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1title
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1title)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1title_FUNC);
@@ -14458,7 +13539,7 @@ fail:
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1visible
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1visible)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1visible_FUNC);
 	gtk_tree_view_column_set_visible((GtkTreeViewColumn *)arg0, arg1);
@@ -14468,7 +13549,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1visible)
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1widget
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1widget)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1widget_FUNC);
 	gtk_tree_view_column_set_widget((GtkTreeViewColumn *)arg0, (GtkWidget *)arg1);
@@ -14477,12 +13558,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1widget)
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1create_1row_1drag_1icon
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1create_1row_1drag_1icon_FUNC);
-	rc = (jint)gtk_tree_view_create_row_drag_icon((GtkTreeView *)arg0, (GtkTreePath *)arg1);
+	rc = (jintLong)gtk_tree_view_create_row_drag_icon((GtkTreeView *)arg0, (GtkTreePath *)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1create_1row_1drag_1icon_FUNC);
 	return rc;
 }
@@ -14490,7 +13571,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon)
 
 #ifndef NO__1gtk_1tree_1view_1expand_1row
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1expand_1row)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1expand_1row_FUNC);
@@ -14502,7 +13583,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1expand_1row)
 
 #ifndef NO__1gtk_1tree_1view_1get_1background_1area
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1background_1area)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
 {
 	GdkRectangle _arg3, *lparg3=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1background_1area_FUNC);
@@ -14515,12 +13596,12 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1bin_1window
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1bin_1window)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1bin_1window)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1bin_1window_FUNC);
-	rc = (jint)gtk_tree_view_get_bin_window((GtkTreeView *)arg0);
+	rc = (jintLong)gtk_tree_view_get_bin_window((GtkTreeView *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1bin_1window_FUNC);
 	return rc;
 }
@@ -14528,7 +13609,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1bin_1window)
 
 #ifndef NO__1gtk_1tree_1view_1get_1cell_1area
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1cell_1area)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
 {
 	GdkRectangle _arg3, *lparg3=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1cell_1area_FUNC);
@@ -14541,24 +13622,24 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1column
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1column)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1column)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1column_FUNC);
-	rc = (jint)gtk_tree_view_get_column((GtkTreeView *)arg0, (gint)arg1);
+	rc = (jintLong)gtk_tree_view_get_column((GtkTreeView *)arg0, (gint)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1column_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1columns
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1columns)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1columns)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1columns_FUNC);
-	rc = (jint)gtk_tree_view_get_columns((GtkTreeView *)arg0);
+	rc = (jintLong)gtk_tree_view_get_columns((GtkTreeView *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1columns_FUNC);
 	return rc;
 }
@@ -14566,28 +13647,28 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1columns)
 
 #ifndef NO__1gtk_1tree_1view_1get_1cursor
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1cursor)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2)
 {
-	jint *lparg1=NULL;
-	jint *lparg2=NULL;
+	jintLong *lparg1=NULL;
+	jintLong *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1cursor_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_tree_view_get_cursor((GtkTreeView *)arg0, (GtkTreePath **)lparg1, (GtkTreeViewColumn **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1cursor_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1expander_1column
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1expander_1column)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1expander_1column)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC);
-	rc = (jint)gtk_tree_view_get_expander_column((GtkTreeView *)arg0);
+	rc = (jintLong)gtk_tree_view_get_expander_column((GtkTreeView *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC);
 	return rc;
 }
@@ -14595,7 +13676,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1expander_1column)
 
 #ifndef NO__1gtk_1tree_1view_1get_1headers_1visible
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1headers_1visible)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1headers_1visible_FUNC);
@@ -14607,24 +13688,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1headers_1visible)
 
 #ifndef NO__1gtk_1tree_1view_1get_1path_1at_1pos
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1path_1at_1pos)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5, jintArray arg6)
 {
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint *lparg6=NULL;
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1path_1at_1pos_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	rc = (jboolean)gtk_tree_view_get_path_at_pos((GtkTreeView *)arg0, (gint)arg1, (gint)arg2, (GtkTreePath **)lparg3, (GtkTreeViewColumn **)lparg4, (gint *)lparg5, (gint *)lparg6);
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1path_1at_1pos_FUNC);
 	return rc;
 }
@@ -14632,7 +13713,7 @@ fail:
 
 #ifndef NO__1gtk_1tree_1view_1get_1rules_1hint
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1rules_1hint)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1rules_1hint_FUNC);
@@ -14643,12 +13724,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1rules_1hint)
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1selection
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1selection)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1selection)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1selection_FUNC);
-	rc = (jint)gtk_tree_view_get_selection((GtkTreeView *)arg0);
+	rc = (jintLong)gtk_tree_view_get_selection((GtkTreeView *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1selection_FUNC);
 	return rc;
 }
@@ -14656,7 +13737,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1selection)
 
 #ifndef NO__1gtk_1tree_1view_1get_1visible_1rect
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1visible_1rect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1visible_1rect_FUNC);
@@ -14670,7 +13751,7 @@ fail:
 
 #ifndef NO__1gtk_1tree_1view_1insert_1column
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1insert_1column)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1insert_1column_FUNC);
@@ -14682,7 +13763,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1insert_1column)
 
 #ifndef NO__1gtk_1tree_1view_1move_1column_1after
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1move_1column_1after)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1move_1column_1after_FUNC);
 	gtk_tree_view_move_column_after((GtkTreeView *)arg0, (GtkTreeViewColumn *)arg1, (GtkTreeViewColumn *)arg2);
@@ -14691,12 +13772,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1move_1column_1after)
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1new_1with_1model
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1new_1with_1model)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1new_1with_1model)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1new_1with_1model_FUNC);
-	rc = (jint)gtk_tree_view_new_with_model((GtkTreeModel *)arg0);
+	rc = (jintLong)gtk_tree_view_new_with_model((GtkTreeModel *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1new_1with_1model_FUNC);
 	return rc;
 }
@@ -14704,7 +13785,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1new_1with_1model)
 
 #ifndef NO__1gtk_1tree_1view_1remove_1column
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1remove_1column)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1remove_1column_FUNC);
 	gtk_tree_view_remove_column((GtkTreeView *)arg0, (GtkTreeViewColumn *)arg1);
@@ -14714,7 +13795,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1remove_1column)
 
 #ifndef NO__1gtk_1tree_1view_1row_1expanded
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1row_1expanded)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1row_1expanded_FUNC);
@@ -14726,7 +13807,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1row_1expanded)
 
 #ifndef NO__1gtk_1tree_1view_1scroll_1to_1cell
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1scroll_1to_1cell)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jfloat arg4, jfloat arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3, jfloat arg4, jfloat arg5)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1scroll_1to_1cell_FUNC);
 	gtk_tree_view_scroll_to_cell((GtkTreeView *)arg0, (GtkTreePath *)arg1, (GtkTreeViewColumn *)arg2, (gboolean)arg3, (gfloat)arg4, (gfloat)arg5);
@@ -14736,7 +13817,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1scroll_1to_1cell)
 
 #ifndef NO__1gtk_1tree_1view_1scroll_1to_1point
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1scroll_1to_1point)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1scroll_1to_1point_FUNC);
 	gtk_tree_view_scroll_to_point((GtkTreeView *)arg0, (gint)arg1, (gint)arg2);
@@ -14746,7 +13827,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1scroll_1to_1point)
 
 #ifndef NO__1gtk_1tree_1view_1set_1cursor
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1cursor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1cursor_FUNC);
 	gtk_tree_view_set_cursor((GtkTreeView *)arg0, (GtkTreePath *)arg1, (GtkTreeViewColumn *)arg2, arg3);
@@ -14756,7 +13837,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1cursor)
 
 #ifndef NO__1gtk_1tree_1view_1set_1drag_1dest_1row
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1drag_1dest_1row)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1drag_1dest_1row_FUNC);
 	gtk_tree_view_set_drag_dest_row((GtkTreeView *)arg0, (GtkTreePath *)arg1, arg2);
@@ -14766,7 +13847,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1drag_1dest_1row)
 
 #ifndef NO__1gtk_1tree_1view_1set_1enable_1search
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1enable_1search)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1enable_1search_FUNC);
 	gtk_tree_view_set_enable_search((GtkTreeView *)arg0, arg1);
@@ -14776,24 +13857,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1enable_1search)
 
 #ifndef NO__1gtk_1tree_1view_1set_1grid_1lines
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1grid_1lines)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1grid_1lines_FUNC);
 /*
 	gtk_tree_view_set_grid_lines((GtkTreeView*)arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GtkTreeView*, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_tree_view_set_grid_lines_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_tree_view_set_grid_lines");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GtkTreeView*)arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_tree_view_set_grid_lines)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkTreeView*, jint))fp)((GtkTreeView*)arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1grid_1lines_FUNC);
@@ -14802,7 +13875,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1grid_1lines)
 
 #ifndef NO__1gtk_1tree_1view_1set_1headers_1visible
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1headers_1visible)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1headers_1visible_FUNC);
 	gtk_tree_view_set_headers_visible((GtkTreeView *)arg0, (gboolean)arg1);
@@ -14812,7 +13885,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1headers_1visible)
 
 #ifndef NO__1gtk_1tree_1view_1set_1model
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1model)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1model_FUNC);
 	gtk_tree_view_set_model((GtkTreeView *)arg0, (GtkTreeModel *)arg1);
@@ -14822,7 +13895,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1model)
 
 #ifndef NO__1gtk_1tree_1view_1set_1rules_1hint
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1rules_1hint)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1rules_1hint_FUNC);
 	gtk_tree_view_set_rules_hint((GtkTreeView *)arg0, arg1);
@@ -14832,7 +13905,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1rules_1hint)
 
 #ifndef NO__1gtk_1tree_1view_1set_1search_1column
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1search_1column)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1search_1column_FUNC);
 	gtk_tree_view_set_search_column((GtkTreeView *)arg0, (gint)arg1);
@@ -14842,7 +13915,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1search_1column)
 
 #ifndef NO__1gtk_1tree_1view_1tree_1to_1widget_1coords
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1tree_1to_1widget_1coords)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
 {
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
@@ -14859,7 +13932,7 @@ fail:
 
 #ifndef NO__1gtk_1tree_1view_1unset_1rows_1drag_1dest
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1unset_1rows_1drag_1dest)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC);
 	gtk_tree_view_unset_rows_drag_dest((GtkTreeView *)arg0);
@@ -14869,7 +13942,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1unset_1rows_1drag_1dest)
 
 #ifndef NO__1gtk_1tree_1view_1widget_1to_1tree_1coords
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1widget_1to_1tree_1coords)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
 {
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
@@ -14885,12 +13958,12 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1vbox_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vbox_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1vbox_1new)
 	(JNIEnv *env, jclass that, jboolean arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1vbox_1new_FUNC);
-	rc = (jint)gtk_vbox_new((gboolean)arg0, (gint)arg1);
+	rc = (jintLong)gtk_vbox_new((gboolean)arg0, (gint)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1vbox_1new_FUNC);
 	return rc;
 }
@@ -14898,7 +13971,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vbox_1new)
 
 #ifndef NO__1gtk_1viewport_1get_1shadow_1type
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1viewport_1get_1shadow_1type)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1viewport_1get_1shadow_1type_FUNC);
@@ -14910,7 +13983,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1viewport_1get_1shadow_1type)
 
 #ifndef NO__1gtk_1viewport_1set_1shadow_1type
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1viewport_1set_1shadow_1type)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1viewport_1set_1shadow_1type_FUNC);
 	gtk_viewport_set_shadow_type((GtkViewport *)arg0, (GtkShadowType)arg1);
@@ -14919,36 +13992,36 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1viewport_1set_1shadow_1type)
 #endif
 
 #ifndef NO__1gtk_1vscale_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vscale_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1vscale_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1vscale_1new_FUNC);
-	rc = (jint)gtk_vscale_new((GtkAdjustment *)arg0);
+	rc = (jintLong)gtk_vscale_new((GtkAdjustment *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1vscale_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1vscrollbar_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vscrollbar_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1vscrollbar_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1vscrollbar_1new_FUNC);
-	rc = (jint)gtk_vscrollbar_new((GtkAdjustment *)arg0);
+	rc = (jintLong)gtk_vscrollbar_new((GtkAdjustment *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1vscrollbar_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1vseparator_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vseparator_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1vseparator_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1vseparator_1new_FUNC);
-	rc = (jint)gtk_vseparator_new();
+	rc = (jintLong)gtk_vseparator_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1vseparator_1new_FUNC);
 	return rc;
 }
@@ -14956,7 +14029,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vseparator_1new)
 
 #ifndef NO__1gtk_1widget_1add_1accelerator
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1add_1accelerator)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3, jint arg4, jint arg5)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1accelerator_FUNC);
@@ -14970,7 +14043,7 @@ fail:
 
 #ifndef NO__1gtk_1widget_1add_1events
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1add_1events)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1events_FUNC);
 	gtk_widget_add_events((GtkWidget *)arg0, (gint)arg1);
@@ -14980,7 +14053,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1add_1events)
 
 #ifndef NO__1gtk_1widget_1child_1focus
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1child_1focus)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1child_1focus_FUNC);
@@ -14990,37 +14063,59 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1child_1focus)
 }
 #endif
 
-#ifndef NO__1gtk_1widget_1create_1pango_1layout__II
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO__1gtk_1widget_1create_1pango_1layout__II) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1create_1pango_1layout__JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__II_FUNC);
-	rc = (jint)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)arg1);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__JJ_FUNC);
+#endif
+	rc = (jintLong)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO__1gtk_1widget_1create_1pango_1layout__I_3B
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__I_3B)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+#if (!defined(NO__1gtk_1widget_1create_1pango_1layout__I_3B) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1create_1pango_1layout__J_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#endif
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)lparg1);
+	rc = (jintLong)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1destroy
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1destroy_FUNC);
 	gtk_widget_destroy((GtkWidget *)arg0);
@@ -15030,7 +14125,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1destroy)
 
 #ifndef NO__1gtk_1widget_1event
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1event)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1event_FUNC);
@@ -15041,12 +14136,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1event)
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1accessible
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1accessible)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1accessible)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1accessible_FUNC);
-	rc = (jint)gtk_widget_get_accessible((GtkWidget *)arg0);
+	rc = (jintLong)gtk_widget_get_accessible((GtkWidget *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1accessible_FUNC);
 	return rc;
 }
@@ -15054,7 +14149,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1accessible)
 
 #ifndef NO__1gtk_1widget_1get_1child_1visible
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1child_1visible)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1child_1visible_FUNC);
@@ -15077,12 +14172,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1default_1direction)
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1default_1style
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1default_1style)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1default_1style)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1default_1style_FUNC);
-	rc = (jint)gtk_widget_get_default_style();
+	rc = (jintLong)gtk_widget_get_default_style();
 	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1default_1style_FUNC);
 	return rc;
 }
@@ -15090,7 +14185,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1default_1style)
 
 #ifndef NO__1gtk_1widget_1get_1direction
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1direction)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1direction_FUNC);
@@ -15102,7 +14197,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1direction)
 
 #ifndef NO__1gtk_1widget_1get_1events
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1events)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1events_FUNC);
@@ -15113,36 +14208,36 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1events)
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1modifier_1style
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1modifier_1style)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1modifier_1style)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1modifier_1style_FUNC);
-	rc = (jint)gtk_widget_get_modifier_style((GtkWidget *)arg0);
+	rc = (jintLong)gtk_widget_get_modifier_style((GtkWidget *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1modifier_1style_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1pango_1context
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1pango_1context)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1pango_1context)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1pango_1context_FUNC);
-	rc = (jint)gtk_widget_get_pango_context((GtkWidget *)arg0);
+	rc = (jintLong)gtk_widget_get_pango_context((GtkWidget *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1pango_1context_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1parent
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1parent)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1parent)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1parent_FUNC);
-	rc = (jint)gtk_widget_get_parent((GtkWidget *)arg0);
+	rc = (jintLong)gtk_widget_get_parent((GtkWidget *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1parent_FUNC);
 	return rc;
 }
@@ -15150,7 +14245,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1parent)
 
 #ifndef NO__1gtk_1widget_1get_1size_1request
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1get_1size_1request)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -15166,24 +14261,24 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1style
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1style)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1style)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1style_FUNC);
-	rc = (jint)gtk_widget_get_style((GtkWidget *)arg0);
+	rc = (jintLong)gtk_widget_get_style((GtkWidget *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1style_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1toplevel
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1toplevel)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1toplevel)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1toplevel_FUNC);
-	rc = (jint)gtk_widget_get_toplevel((GtkWidget *)arg0);
+	rc = (jintLong)gtk_widget_get_toplevel((GtkWidget *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1toplevel_FUNC);
 	return rc;
 }
@@ -15191,7 +14286,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1toplevel)
 
 #ifndef NO__1gtk_1widget_1grab_1focus
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1grab_1focus)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1grab_1focus_FUNC);
 	gtk_widget_grab_focus((GtkWidget *)arg0);
@@ -15201,7 +14296,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1grab_1focus)
 
 #ifndef NO__1gtk_1widget_1hide
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1hide)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1hide_FUNC);
 	gtk_widget_hide((GtkWidget *)arg0);
@@ -15211,7 +14306,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1hide)
 
 #ifndef NO__1gtk_1widget_1is_1composited
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1composited)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1is_1composited_FUNC);
@@ -15219,18 +14314,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1composited)
 	rc = (jboolean)gtk_widget_is_composited((GtkWidget *)arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(GtkWidget *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_widget_is_composited_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_widget_is_composited");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)((GtkWidget *)arg0);
+		LOAD_FUNCTION(fp, gtk_widget_is_composited)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1is_1composited_FUNC);
@@ -15240,7 +14326,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1composited)
 
 #ifndef NO__1gtk_1widget_1is_1focus
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1focus)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1is_1focus_FUNC);
@@ -15252,7 +14338,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1focus)
 
 #ifndef NO__1gtk_1widget_1map
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1map)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1map_FUNC);
 	gtk_widget_map((GtkWidget *)arg0);
@@ -15262,7 +14348,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1map)
 
 #ifndef NO__1gtk_1widget_1mnemonic_1activate
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1mnemonic_1activate)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1mnemonic_1activate_FUNC);
@@ -15274,7 +14360,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1mnemonic_1activate)
 
 #ifndef NO__1gtk_1widget_1modify_1base
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1base)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1base_FUNC);
@@ -15287,7 +14373,7 @@ fail:
 
 #ifndef NO__1gtk_1widget_1modify_1bg
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1bg)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1bg_FUNC);
@@ -15300,7 +14386,7 @@ fail:
 
 #ifndef NO__1gtk_1widget_1modify_1fg
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1fg)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1fg_FUNC);
@@ -15313,7 +14399,7 @@ fail:
 
 #ifndef NO__1gtk_1widget_1modify_1font
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1font)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1font_FUNC);
 	gtk_widget_modify_font((GtkWidget *)arg0, (PangoFontDescription *)arg1);
@@ -15323,7 +14409,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1font)
 
 #ifndef NO__1gtk_1widget_1modify_1style
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1style)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1style_FUNC);
 	gtk_widget_modify_style((GtkWidget *)arg0, (GtkRcStyle *)arg1);
@@ -15333,7 +14419,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1style)
 
 #ifndef NO__1gtk_1widget_1modify_1text
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1text)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1text_FUNC);
@@ -15346,7 +14432,7 @@ fail:
 
 #ifndef NO__1gtk_1widget_1queue_1resize
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1queue_1resize)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1queue_1resize_FUNC);
 	gtk_widget_queue_resize((GtkWidget *)arg0);
@@ -15356,7 +14442,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1queue_1resize)
 
 #ifndef NO__1gtk_1widget_1realize
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1realize)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1realize_FUNC);
 	gtk_widget_realize((GtkWidget *)arg0);
@@ -15366,7 +14452,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1realize)
 
 #ifndef NO__1gtk_1widget_1remove_1accelerator
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1remove_1accelerator)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1remove_1accelerator_FUNC);
 	gtk_widget_remove_accelerator((GtkWidget *)arg0, (GtkAccelGroup *)arg1, (guint)arg2, (GdkModifierType)arg3);
@@ -15376,7 +14462,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1remove_1accelerator)
 
 #ifndef NO__1gtk_1widget_1reparent
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1reparent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1reparent_FUNC);
 	gtk_widget_reparent((GtkWidget *)arg0, (GtkWidget *)arg1);
@@ -15386,7 +14472,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1reparent)
 
 #ifndef NO__1gtk_1widget_1send_1expose
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1send_1expose)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1send_1expose_FUNC);
@@ -15398,7 +14484,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1send_1expose)
 
 #ifndef NO__1gtk_1widget_1set_1app_1paintable
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1app_1paintable)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1app_1paintable_FUNC);
 	gtk_widget_set_app_paintable((GtkWidget *)arg0, arg1);
@@ -15418,7 +14504,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1default_1direction)
 
 #ifndef NO__1gtk_1widget_1set_1direction
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1direction)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1direction_FUNC);
 	gtk_widget_set_direction((GtkWidget *)arg0, (GtkTextDirection)arg1);
@@ -15428,7 +14514,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1direction)
 
 #ifndef NO__1gtk_1widget_1set_1double_1buffered
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1double_1buffered)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1double_1buffered_FUNC);
 	gtk_widget_set_double_buffered((GtkWidget *)arg0, (gboolean)arg1);
@@ -15438,7 +14524,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1double_1buffered)
 
 #ifndef NO__1gtk_1widget_1set_1name
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1name)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1name_FUNC);
@@ -15452,7 +14538,7 @@ fail:
 
 #ifndef NO__1gtk_1widget_1set_1parent_1window
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1parent_1window)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1parent_1window_FUNC);
 	gtk_widget_set_parent_window((GtkWidget *)arg0, (GdkWindow *)arg1);
@@ -15462,7 +14548,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1parent_1window)
 
 #ifndef NO__1gtk_1widget_1set_1redraw_1on_1allocate
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1redraw_1on_1allocate)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1redraw_1on_1allocate_FUNC);
 	gtk_widget_set_redraw_on_allocate((GtkWidget *)arg0, (gboolean)arg1);
@@ -15472,7 +14558,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1redraw_1on_1allocate)
 
 #ifndef NO__1gtk_1widget_1set_1sensitive
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1sensitive)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1sensitive_FUNC);
 	gtk_widget_set_sensitive((GtkWidget *)arg0, (gboolean)arg1);
@@ -15482,7 +14568,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1sensitive)
 
 #ifndef NO__1gtk_1widget_1set_1size_1request
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1size_1request)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1size_1request_FUNC);
 	gtk_widget_set_size_request((GtkWidget *)arg0, (gint)arg1, (gint)arg2);
@@ -15492,7 +14578,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1size_1request)
 
 #ifndef NO__1gtk_1widget_1set_1state
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1state)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1state_FUNC);
 	gtk_widget_set_state((GtkWidget *)arg0, (GtkStateType)arg1);
@@ -15502,7 +14588,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1state)
 
 #ifndef NO__1gtk_1widget_1set_1style
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1style)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1style_FUNC);
 	gtk_widget_set_style((GtkWidget *)arg0, (GtkStyle *)arg1);
@@ -15512,7 +14598,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1style)
 
 #ifndef NO__1gtk_1widget_1set_1tooltip_1text
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1tooltip_1text)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1tooltip_1text_FUNC);
@@ -15521,17 +14607,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1tooltip_1text)
 	gtk_widget_set_tooltip_text((GtkWidget *)arg0, (const gchar *)lparg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GtkWidget *, const gchar *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_widget_set_tooltip_text_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_widget_set_tooltip_text");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GtkWidget *)arg0, (const gchar *)lparg1);
+		LOAD_FUNCTION(fp, gtk_widget_set_tooltip_text)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkWidget *, const gchar *))fp)((GtkWidget *)arg0, (const gchar *)lparg1);
 		}
 	}
 fail:
@@ -15542,7 +14620,7 @@ fail:
 
 #ifndef NO__1gtk_1widget_1shape_1combine_1mask
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1shape_1combine_1mask)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1shape_1combine_1mask_FUNC);
 	gtk_widget_shape_combine_mask((GtkWidget *)arg0, (GdkBitmap *)arg1, (gint)arg2, (gint)arg3);
@@ -15552,7 +14630,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1shape_1combine_1mask)
 
 #ifndef NO__1gtk_1widget_1show
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1show)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1show_FUNC);
 	gtk_widget_show((GtkWidget *)arg0);
@@ -15562,7 +14640,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1show)
 
 #ifndef NO__1gtk_1widget_1show_1now
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1show_1now)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1show_1now_FUNC);
 	gtk_widget_show_now((GtkWidget *)arg0);
@@ -15572,7 +14650,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1show_1now)
 
 #ifndef NO__1gtk_1widget_1size_1allocate
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1size_1allocate)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GtkAllocation _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1allocate_FUNC);
@@ -15585,7 +14663,7 @@ fail:
 
 #ifndef NO__1gtk_1widget_1size_1request
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1size_1request)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GtkRequisition _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1request_FUNC);
@@ -15597,43 +14675,65 @@ fail:
 }
 #endif
 
-#ifndef NO__1gtk_1widget_1style_1get__I_3B_3II
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__I_3B_3II)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jintArray arg2, jint arg3)
+#if (!defined(NO__1gtk_1widget_1style_1get__I_3B_3II) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1style_1get__J_3B_3IJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__I_3B_3II)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__J_3B_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
+#endif
 {
 	jbyte *lparg1=NULL;
 	jint *lparg2=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO__1gtk_1widget_1style_1get__I_3B_3JI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__I_3B_3JI)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jlongArray arg2, jint arg3)
+#if (!defined(NO__1gtk_1widget_1style_1get__I_3B_3JI) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1style_1get__J_3B_3JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__I_3B_3JI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__J_3B_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3)
+#endif
 {
 	jbyte *lparg1=NULL;
 	jlong *lparg2=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1translate_1coordinates
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1translate_1coordinates)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
 {
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
@@ -15652,7 +14752,7 @@ fail:
 
 #ifndef NO__1gtk_1widget_1unrealize
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1unrealize)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1unrealize_FUNC);
 	gtk_widget_unrealize((GtkWidget *)arg0);
@@ -15662,7 +14762,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1unrealize)
 
 #ifndef NO__1gtk_1window_1activate_1default
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1activate_1default)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1activate_1default_FUNC);
@@ -15674,7 +14774,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1activate_1default)
 
 #ifndef NO__1gtk_1window_1add_1accel_1group
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1add_1accel_1group)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1add_1accel_1group_FUNC);
 	gtk_window_add_accel_group((GtkWindow *)arg0, (GtkAccelGroup *)arg1);
@@ -15684,7 +14784,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1add_1accel_1group)
 
 #ifndef NO__1gtk_1window_1deiconify
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1deiconify)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1deiconify_FUNC);
 	gtk_window_deiconify((GtkWindow *)arg0);
@@ -15694,7 +14794,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1deiconify)
 
 #ifndef NO__1gtk_1window_1fullscreen
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1fullscreen)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1fullscreen_FUNC);
 	gtk_window_fullscreen((GtkWindow *)arg0);
@@ -15703,39 +14803,30 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1fullscreen)
 #endif
 
 #ifndef NO__1gtk_1window_1get_1focus
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1focus)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1get_1focus)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1focus_FUNC);
-	rc = (jint)gtk_window_get_focus((GtkWindow *)arg0);
+	rc = (jintLong)gtk_window_get_focus((GtkWindow *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1focus_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1get_1group
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1group)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1get_1group)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1group_FUNC);
 /*
-	rc = (jint)gtk_window_get_group((GtkWindow *)arg0);
+	rc = (jintLong)gtk_window_get_group((GtkWindow *)arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(GtkWindow *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_window_get_group_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_window_get_group");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((GtkWindow *)arg0);
+		LOAD_FUNCTION(fp, gtk_window_get_group)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWindow *))fp)((GtkWindow *)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1group_FUNC);
@@ -15744,12 +14835,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1group)
 #endif
 
 #ifndef NO__1gtk_1window_1get_1icon_1list
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1icon_1list)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1get_1icon_1list)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1icon_1list_FUNC);
-	rc = (jint)gtk_window_get_icon_list((GtkWindow *)arg0);
+	rc = (jintLong)gtk_window_get_icon_list((GtkWindow *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1icon_1list_FUNC);
 	return rc;
 }
@@ -15757,7 +14848,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1icon_1list)
 
 #ifndef NO__1gtk_1window_1get_1mnemonic_1modifier
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1mnemonic_1modifier)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1mnemonic_1modifier_FUNC);
@@ -15769,7 +14860,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1mnemonic_1modifier)
 
 #ifndef NO__1gtk_1window_1get_1modal
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1get_1modal)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1modal_FUNC);
@@ -15781,7 +14872,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1get_1modal)
 
 #ifndef NO__1gtk_1window_1get_1opacity
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1window_1get_1opacity)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1opacity_FUNC);
@@ -15789,18 +14880,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1window_1get_1opacity)
 	rc = (jdouble)gtk_window_get_opacity((GtkWindow *)arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jdouble (*FPTR)(GtkWindow *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_window_get_opacity_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_window_get_opacity");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jdouble)(*fptr)((GtkWindow *)arg0);
+		LOAD_FUNCTION(fp, gtk_window_get_opacity)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GtkWindow *))fp)((GtkWindow *)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1opacity_FUNC);
@@ -15810,7 +14892,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1window_1get_1opacity)
 
 #ifndef NO__1gtk_1window_1get_1position
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1get_1position)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -15827,7 +14909,7 @@ fail:
 
 #ifndef NO__1gtk_1window_1get_1size
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1get_1size)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -15844,7 +14926,7 @@ fail:
 
 #ifndef NO__1gtk_1window_1group_1add_1window
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1group_1add_1window)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1group_1add_1window_FUNC);
 	gtk_window_group_add_window((GtkWindowGroup*)arg0, (GtkWindow*)arg1);
@@ -15853,12 +14935,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1group_1add_1window)
 #endif
 
 #ifndef NO__1gtk_1window_1group_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1group_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1group_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1group_1new_FUNC);
-	rc = (jint)gtk_window_group_new();
+	rc = (jintLong)gtk_window_group_new();
 	OS_NATIVE_EXIT(env, that, _1gtk_1window_1group_1new_FUNC);
 	return rc;
 }
@@ -15866,7 +14948,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1group_1new)
 
 #ifndef NO__1gtk_1window_1group_1remove_1window
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1group_1remove_1window)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1group_1remove_1window_FUNC);
 	gtk_window_group_remove_window((GtkWindowGroup*)arg0, (GtkWindow*)arg1);
@@ -15876,7 +14958,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1group_1remove_1window)
 
 #ifndef NO__1gtk_1window_1iconify
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1iconify)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1iconify_FUNC);
 	gtk_window_iconify((GtkWindow *)arg0);
@@ -15885,12 +14967,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1iconify)
 #endif
 
 #ifndef NO__1gtk_1window_1list_1toplevels
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1list_1toplevels)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1list_1toplevels)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1list_1toplevels_FUNC);
-	rc = (jint)gtk_window_list_toplevels();
+	rc = (jintLong)gtk_window_list_toplevels();
 	OS_NATIVE_EXIT(env, that, _1gtk_1window_1list_1toplevels_FUNC);
 	return rc;
 }
@@ -15898,7 +14980,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1list_1toplevels)
 
 #ifndef NO__1gtk_1window_1maximize
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1maximize)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1maximize_FUNC);
 	gtk_window_maximize((GtkWindow *)arg0);
@@ -15908,7 +14990,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1maximize)
 
 #ifndef NO__1gtk_1window_1move
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1move)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1move_FUNC);
 	gtk_window_move((GtkWindow *)arg0, (gint)arg1, (gint)arg2);
@@ -15917,12 +14999,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1move)
 #endif
 
 #ifndef NO__1gtk_1window_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1new)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1new_FUNC);
-	rc = (jint)gtk_window_new((GtkWindowType)arg0);
+	rc = (jintLong)gtk_window_new((GtkWindowType)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1window_1new_FUNC);
 	return rc;
 }
@@ -15930,7 +15012,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1new)
 
 #ifndef NO__1gtk_1window_1present
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1present)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1present_FUNC);
 	gtk_window_present((GtkWindow *)arg0);
@@ -15940,7 +15022,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1present)
 
 #ifndef NO__1gtk_1window_1remove_1accel_1group
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1remove_1accel_1group)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1remove_1accel_1group_FUNC);
 	gtk_window_remove_accel_group((GtkWindow *)arg0, (GtkAccelGroup *)arg1);
@@ -15950,7 +15032,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1remove_1accel_1group)
 
 #ifndef NO__1gtk_1window_1resize
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1resize)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1resize_FUNC);
 	gtk_window_resize((GtkWindow *)arg0, (gint)arg1, (gint)arg2);
@@ -15960,7 +15042,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1resize)
 
 #ifndef NO__1gtk_1window_1set_1default
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1default)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1default_FUNC);
 	gtk_window_set_default((GtkWindow *)arg0, (GtkWidget *)arg1);
@@ -15970,7 +15052,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1default)
 
 #ifndef NO__1gtk_1window_1set_1destroy_1with_1parent
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1destroy_1with_1parent)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1destroy_1with_1parent_FUNC);
 	gtk_window_set_destroy_with_parent((GtkWindow *)arg0, (gboolean)arg1);
@@ -15980,7 +15062,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1destroy_1with_1parent)
 
 #ifndef NO__1gtk_1window_1set_1geometry_1hints
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1geometry_1hints)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3)
 {
 	GdkGeometry _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1geometry_1hints_FUNC);
@@ -15993,7 +15075,7 @@ fail:
 
 #ifndef NO__1gtk_1window_1set_1icon_1list
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1icon_1list)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1icon_1list_FUNC);
 	gtk_window_set_icon_list((GtkWindow *)arg0, (GList *)arg1);
@@ -16003,24 +15085,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1icon_1list)
 
 #ifndef NO__1gtk_1window_1set_1keep_1below
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1keep_1below)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1keep_1below_FUNC);
 /*
 	gtk_window_set_keep_below((GtkWindow *)arg0, (gboolean)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GtkWindow *, gboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_window_set_keep_below_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_window_set_keep_below");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GtkWindow *)arg0, (gboolean)arg1);
+		LOAD_FUNCTION(fp, gtk_window_set_keep_below)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkWindow *, gboolean))fp)((GtkWindow *)arg0, (gboolean)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1keep_1below_FUNC);
@@ -16029,7 +15103,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1keep_1below)
 
 #ifndef NO__1gtk_1window_1set_1modal
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1modal)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1modal_FUNC);
 	gtk_window_set_modal((GtkWindow *)arg0, (gboolean)arg1);
@@ -16039,24 +15113,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1modal)
 
 #ifndef NO__1gtk_1window_1set_1opacity
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1opacity)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1opacity_FUNC);
 /*
 	gtk_window_set_opacity((GtkWindow *)arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GtkWindow *, jdouble);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_window_set_opacity_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_window_set_opacity");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GtkWindow *)arg0, arg1);
+		LOAD_FUNCTION(fp, gtk_window_set_opacity)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkWindow *, jdouble))fp)((GtkWindow *)arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1opacity_FUNC);
@@ -16065,7 +15131,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1opacity)
 
 #ifndef NO__1gtk_1window_1set_1resizable
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1resizable)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1resizable_FUNC);
 	gtk_window_set_resizable((GtkWindow *)arg0, (gboolean)arg1);
@@ -16075,24 +15141,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1resizable)
 
 #ifndef NO__1gtk_1window_1set_1skip_1taskbar_1hint
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1skip_1taskbar_1hint)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1skip_1taskbar_1hint_FUNC);
 /*
 	gtk_window_set_skip_taskbar_hint((GtkWindow *)arg0, (gboolean)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(GtkWindow *, gboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gtk_window_set_skip_taskbar_hint_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gtk_window_set_skip_taskbar_hint");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((GtkWindow *)arg0, (gboolean)arg1);
+		LOAD_FUNCTION(fp, gtk_window_set_skip_taskbar_hint)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkWindow *, gboolean))fp)((GtkWindow *)arg0, (gboolean)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1skip_1taskbar_1hint_FUNC);
@@ -16101,7 +15159,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1skip_1taskbar_1hint)
 
 #ifndef NO__1gtk_1window_1set_1title
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1title)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1title_FUNC);
@@ -16115,7 +15173,7 @@ fail:
 
 #ifndef NO__1gtk_1window_1set_1transient_1for
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1transient_1for)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1transient_1for_FUNC);
 	gtk_window_set_transient_for((GtkWindow *)arg0, (GtkWindow *)arg1);
@@ -16125,7 +15183,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1transient_1for)
 
 #ifndef NO__1gtk_1window_1set_1type_1hint
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1type_1hint)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1type_1hint_FUNC);
 	gtk_window_set_type_hint((GtkWindow *)arg0, arg1);
@@ -16135,7 +15193,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1type_1hint)
 
 #ifndef NO__1gtk_1window_1unfullscreen
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1unfullscreen)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1unfullscreen_FUNC);
 	gtk_window_unfullscreen((GtkWindow *)arg0);
@@ -16145,7 +15203,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1unfullscreen)
 
 #ifndef NO__1gtk_1window_1unmaximize
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1unmaximize)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1window_1unmaximize_FUNC);
 	gtk_window_unmaximize((GtkWindow *)arg0);
@@ -16154,36 +15212,36 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1unmaximize)
 #endif
 
 #ifndef NO__1pango_1attr_1background_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1background_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1background_1new)
 	(JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1background_1new_FUNC);
-	rc = (jint)pango_attr_background_new(arg0, arg1, arg2);
+	rc = (jintLong)pango_attr_background_new(arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1background_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1pango_1attr_1font_1desc_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1font_1desc_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1font_1desc_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1font_1desc_1new_FUNC);
-	rc = (jint)pango_attr_font_desc_new((const PangoFontDescription *)arg0);
+	rc = (jintLong)pango_attr_font_desc_new((const PangoFontDescription *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1font_1desc_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1pango_1attr_1foreground_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1foreground_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1foreground_1new)
 	(JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1foreground_1new_FUNC);
-	rc = (jint)pango_attr_foreground_new(arg0, arg1, arg2);
+	rc = (jintLong)pango_attr_foreground_new(arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1foreground_1new_FUNC);
 	return rc;
 }
@@ -16191,7 +15249,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1foreground_1new)
 
 #ifndef NO__1pango_1attr_1iterator_1destroy
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1iterator_1destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1destroy_FUNC);
 	pango_attr_iterator_destroy((PangoAttrIterator *)arg0);
@@ -16200,24 +15258,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1iterator_1destroy)
 #endif
 
 #ifndef NO__1pango_1attr_1iterator_1get
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1get_FUNC);
-	rc = (jint)pango_attr_iterator_get((PangoAttrIterator *)arg0, (PangoAttrType)arg1);
+	rc = (jintLong)pango_attr_iterator_get((PangoAttrIterator *)arg0, (PangoAttrType)arg1);
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1iterator_1get_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1pango_1attr_1iterator_1get_1attrs
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get_1attrs)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get_1attrs)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1get_1attrs_FUNC);
-	rc = (jint)pango_attr_iterator_get_attrs((PangoAttrIterator *)arg0);
+	rc = (jintLong)pango_attr_iterator_get_attrs((PangoAttrIterator *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1iterator_1get_1attrs_FUNC);
 	return rc;
 }
@@ -16225,7 +15283,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get_1attrs)
 
 #ifndef NO__1pango_1attr_1iterator_1next
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1attr_1iterator_1next)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1next_FUNC);
@@ -16237,7 +15295,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1attr_1iterator_1next)
 
 #ifndef NO__1pango_1attr_1iterator_1range
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1iterator_1range)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -16254,7 +15312,7 @@ fail:
 
 #ifndef NO__1pango_1attr_1list_1change
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1change)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1change_FUNC);
 	pango_attr_list_change((PangoAttrList *)arg0, (PangoAttribute *)arg1);
@@ -16263,12 +15321,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1change)
 #endif
 
 #ifndef NO__1pango_1attr_1list_1get_1iterator
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1list_1get_1iterator)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1list_1get_1iterator)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1get_1iterator_FUNC);
-	rc = (jint)pango_attr_list_get_iterator((PangoAttrList *)arg0);
+	rc = (jintLong)pango_attr_list_get_iterator((PangoAttrList *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1list_1get_1iterator_FUNC);
 	return rc;
 }
@@ -16276,7 +15334,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1list_1get_1iterator)
 
 #ifndef NO__1pango_1attr_1list_1insert
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1insert)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1insert_FUNC);
 	pango_attr_list_insert((PangoAttrList *)arg0, (PangoAttribute *)arg1);
@@ -16285,12 +15343,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1insert)
 #endif
 
 #ifndef NO__1pango_1attr_1list_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1list_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1list_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1new_FUNC);
-	rc = (jint)pango_attr_list_new();
+	rc = (jintLong)pango_attr_list_new();
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1list_1new_FUNC);
 	return rc;
 }
@@ -16298,7 +15356,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1list_1new)
 
 #ifndef NO__1pango_1attr_1list_1unref
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1unref)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1unref_FUNC);
 	pango_attr_list_unref((PangoAttrList *)arg0);
@@ -16307,28 +15365,28 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1unref)
 #endif
 
 #ifndef NO__1pango_1attr_1rise_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1rise_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1rise_1new)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1rise_1new_FUNC);
-	rc = (jint)pango_attr_rise_new(arg0);
+	rc = (jintLong)pango_attr_rise_new(arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1rise_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1pango_1attr_1shape_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1shape_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1shape_1new)
 	(JNIEnv *env, jclass that, jobject arg0, jobject arg1)
 {
 	PangoRectangle _arg0, *lparg0=NULL;
 	PangoRectangle _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1shape_1new_FUNC);
 	if (arg0) if ((lparg0 = getPangoRectangleFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getPangoRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)pango_attr_shape_new(lparg0, lparg1);
+	rc = (jintLong)pango_attr_shape_new(lparg0, lparg1);
 fail:
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1shape_1new_FUNC);
 	return rc;
@@ -16336,27 +15394,18 @@ fail:
 #endif
 
 #ifndef NO__1pango_1attr_1strikethrough_1color_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1color_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1color_1new)
 	(JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1strikethrough_1color_1new_FUNC);
 /*
-	rc = (jint)pango_attr_strikethrough_color_new(arg0, arg1, arg2);
+	rc = (jintLong)pango_attr_strikethrough_color_new(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jshort, jshort, jshort);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_attr_strikethrough_color_new_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_attr_strikethrough_color_new");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, pango_attr_strikethrough_color_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jshort, jshort, jshort))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1strikethrough_1color_1new_FUNC);
@@ -16365,39 +15414,30 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1color_1new)
 #endif
 
 #ifndef NO__1pango_1attr_1strikethrough_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1new)
 	(JNIEnv *env, jclass that, jboolean arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1strikethrough_1new_FUNC);
-	rc = (jint)pango_attr_strikethrough_new(arg0);
+	rc = (jintLong)pango_attr_strikethrough_new(arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1strikethrough_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1pango_1attr_1underline_1color_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1underline_1color_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1underline_1color_1new)
 	(JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1underline_1color_1new_FUNC);
 /*
-	rc = (jint)pango_attr_underline_color_new(arg0, arg1, arg2);
+	rc = (jintLong)pango_attr_underline_color_new(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jshort, jshort, jshort);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_attr_underline_color_new_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_attr_underline_color_new");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, pango_attr_underline_color_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jshort, jshort, jshort))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1underline_1color_1new_FUNC);
@@ -16406,51 +15446,42 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1underline_1color_1new)
 #endif
 
 #ifndef NO__1pango_1attr_1underline_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1underline_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1underline_1new)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1underline_1new_FUNC);
-	rc = (jint)pango_attr_underline_new(arg0);
+	rc = (jintLong)pango_attr_underline_new(arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1underline_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1pango_1attr_1weight_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1weight_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1weight_1new)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1attr_1weight_1new_FUNC);
-	rc = (jint)pango_attr_weight_new(arg0);
+	rc = (jintLong)pango_attr_weight_new(arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1attr_1weight_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1pango_1cairo_1context_1get_1font_1options
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1cairo_1context_1get_1font_1options_FUNC);
 /*
-	rc = (jint)pango_cairo_context_get_font_options((PangoContext *)arg0);
+	rc = (jintLong)pango_cairo_context_get_font_options((PangoContext *)arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(PangoContext *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_cairo_context_get_font_options_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_context_get_font_options");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((PangoContext *)arg0);
+		LOAD_FUNCTION(fp, pango_cairo_context_get_font_options)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PangoContext *))fp)((PangoContext *)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1cairo_1context_1get_1font_1options_FUNC);
@@ -16460,24 +15491,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options)
 
 #ifndef NO__1pango_1cairo_1context_1set_1font_1options
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1context_1set_1font_1options)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1cairo_1context_1set_1font_1options_FUNC);
 /*
 	pango_cairo_context_set_font_options((PangoContext *)arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(PangoContext *, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_cairo_context_set_font_options_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_context_set_font_options");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)((PangoContext *)arg0, arg1);
+		LOAD_FUNCTION(fp, pango_cairo_context_set_font_options)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(PangoContext *, jintLong))fp)((PangoContext *)arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1cairo_1context_1set_1font_1options_FUNC);
@@ -16485,27 +15508,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1context_1set_1font_1options)
 #endif
 
 #ifndef NO__1pango_1cairo_1create_1layout
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1create_1layout)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1create_1layout)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1cairo_1create_1layout_FUNC);
 /*
-	rc = (jint)pango_cairo_create_layout(arg0);
+	rc = (jintLong)pango_cairo_create_layout(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_cairo_create_layout_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_create_layout");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, pango_cairo_create_layout)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1cairo_1create_1layout_FUNC);
@@ -16514,27 +15528,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1create_1layout)
 #endif
 
 #ifndef NO__1pango_1cairo_1font_1map_1create_1context
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1create_1context)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1create_1context)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1create_1context_FUNC);
 /*
-	rc = (jint)pango_cairo_font_map_create_context(arg0);
+	rc = (jintLong)pango_cairo_font_map_create_context(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_cairo_font_map_create_context_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_font_map_create_context");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, pango_cairo_font_map_create_context)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1cairo_1font_1map_1create_1context_FUNC);
@@ -16543,27 +15548,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1create_1context)
 #endif
 
 #ifndef NO__1pango_1cairo_1font_1map_1get_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1get_1default_FUNC);
 /*
-	rc = (jint)pango_cairo_font_map_get_default();
+	rc = (jintLong)pango_cairo_font_map_get_default();
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)();
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_cairo_font_map_get_default_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_font_map_get_default");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)();
+		LOAD_FUNCTION(fp, pango_cairo_font_map_get_default)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1cairo_1font_1map_1get_1default_FUNC);
@@ -16572,27 +15568,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default)
 #endif
 
 #ifndef NO__1pango_1cairo_1font_1map_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1new_FUNC);
 /*
-	rc = (jint)pango_cairo_font_map_new();
+	rc = (jintLong)pango_cairo_font_map_new();
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)();
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_cairo_font_map_new_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_font_map_new");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)();
+		LOAD_FUNCTION(fp, pango_cairo_font_map_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1cairo_1font_1map_1new_FUNC);
@@ -16602,24 +15589,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1new)
 
 #ifndef NO__1pango_1cairo_1font_1map_1set_1resolution
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1set_1resolution)
-	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1set_1resolution_FUNC);
 /*
 	pango_cairo_font_map_set_resolution(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jdouble);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_cairo_font_map_set_resolution_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_font_map_set_resolution");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, pango_cairo_font_map_set_resolution)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jdouble))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1cairo_1font_1map_1set_1resolution_FUNC);
@@ -16628,24 +15607,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1set_1resolution)
 
 #ifndef NO__1pango_1cairo_1layout_1path
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1layout_1path)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1cairo_1layout_1path_FUNC);
 /*
 	pango_cairo_layout_path(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_cairo_layout_path_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_layout_path");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, pango_cairo_layout_path)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1cairo_1layout_1path_FUNC);
@@ -16654,24 +15625,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1layout_1path)
 
 #ifndef NO__1pango_1cairo_1show_1layout
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1show_1layout)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1cairo_1show_1layout_FUNC);
 /*
 	pango_cairo_show_layout(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_cairo_show_layout_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_show_layout");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, pango_cairo_show_layout)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1cairo_1show_1layout_FUNC);
@@ -16680,7 +15643,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1show_1layout)
 
 #ifndef NO__1pango_1context_1get_1base_1dir
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1base_1dir)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1context_1get_1base_1dir_FUNC);
@@ -16691,24 +15654,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1base_1dir)
 #endif
 
 #ifndef NO__1pango_1context_1get_1language
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1language)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1context_1get_1language)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1context_1get_1language_FUNC);
-	rc = (jint)pango_context_get_language((PangoContext *)arg0);
+	rc = (jintLong)pango_context_get_language((PangoContext *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1context_1get_1language_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1pango_1context_1get_1metrics
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1metrics)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1context_1get_1metrics)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1context_1get_1metrics_FUNC);
-	rc = (jint)pango_context_get_metrics((PangoContext *)arg0, (const PangoFontDescription *)arg1, (PangoLanguage *)arg2);
+	rc = (jintLong)pango_context_get_metrics((PangoContext *)arg0, (const PangoFontDescription *)arg1, (PangoLanguage *)arg2);
 	OS_NATIVE_EXIT(env, that, _1pango_1context_1get_1metrics_FUNC);
 	return rc;
 }
@@ -16716,24 +15679,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1metrics)
 
 #ifndef NO__1pango_1context_1list_1families
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1list_1families)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1pango_1context_1list_1families_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	pango_context_list_families((PangoContext *)arg0, (PangoFontFamily ***)lparg1, (int *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1pango_1context_1list_1families_FUNC);
 }
 #endif
 
 #ifndef NO__1pango_1context_1set_1base_1dir
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1base_1dir)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1context_1set_1base_1dir_FUNC);
 	pango_context_set_base_dir((PangoContext *)arg0, arg1);
@@ -16743,7 +15706,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1base_1dir)
 
 #ifndef NO__1pango_1context_1set_1language
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1language)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1context_1set_1language_FUNC);
 	pango_context_set_language((PangoContext *)arg0, (PangoLanguage *)arg1);
@@ -16752,12 +15715,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1language)
 #endif
 
 #ifndef NO__1pango_1font_1description_1copy
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1copy)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1copy)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1copy_FUNC);
-	rc = (jint)pango_font_description_copy((PangoFontDescription *)arg0);
+	rc = (jintLong)pango_font_description_copy((PangoFontDescription *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1copy_FUNC);
 	return rc;
 }
@@ -16765,7 +15728,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1copy)
 
 #ifndef NO__1pango_1font_1description_1free
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1free_FUNC);
 	pango_font_description_free((PangoFontDescription *)arg0);
@@ -16774,11 +15737,11 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1free)
 #endif
 
 #ifndef NO__1pango_1font_1description_1from_1string
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1from_1string)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1from_1string)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1from_1string_FUNC);
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -16788,7 +15751,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1from_1string)
 	{
 		if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)pango_font_description_from_string((const char *)lparg0);
+	rc = (jintLong)pango_font_description_from_string((const char *)lparg0);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -16804,12 +15767,12 @@ fail:
 #endif
 
 #ifndef NO__1pango_1font_1description_1get_1family
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1family)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1get_1family)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1family_FUNC);
-	rc = (jint)pango_font_description_get_family((PangoFontDescription *)arg0);
+	rc = (jintLong)pango_font_description_get_family((PangoFontDescription *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1get_1family_FUNC);
 	return rc;
 }
@@ -16817,7 +15780,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1family)
 
 #ifndef NO__1pango_1font_1description_1get_1size
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1size)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1size_FUNC);
@@ -16829,7 +15792,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1size)
 
 #ifndef NO__1pango_1font_1description_1get_1style
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1style)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1style_FUNC);
@@ -16841,7 +15804,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1style)
 
 #ifndef NO__1pango_1font_1description_1get_1weight
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1weight)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1weight_FUNC);
@@ -16852,12 +15815,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1weight)
 #endif
 
 #ifndef NO__1pango_1font_1description_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1new_FUNC);
-	rc = (jint)pango_font_description_new();
+	rc = (jintLong)pango_font_description_new();
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1new_FUNC);
 	return rc;
 }
@@ -16865,7 +15828,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1new)
 
 #ifndef NO__1pango_1font_1description_1set_1family
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1family)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1family_FUNC);
@@ -16893,7 +15856,7 @@ fail:
 
 #ifndef NO__1pango_1font_1description_1set_1size
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1size)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1size_FUNC);
 	pango_font_description_set_size((PangoFontDescription *)arg0, (gint)arg1);
@@ -16903,7 +15866,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1size)
 
 #ifndef NO__1pango_1font_1description_1set_1stretch
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1stretch)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1stretch_FUNC);
 	pango_font_description_set_stretch((PangoFontDescription *)arg0, (PangoStretch)arg1);
@@ -16913,7 +15876,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1stretch)
 
 #ifndef NO__1pango_1font_1description_1set_1style
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1style)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1style_FUNC);
 	pango_font_description_set_style((PangoFontDescription *)arg0, (PangoStyle)arg1);
@@ -16923,7 +15886,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1style)
 
 #ifndef NO__1pango_1font_1description_1set_1weight
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1weight)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1weight_FUNC);
 	pango_font_description_set_weight((PangoFontDescription *)arg0, (PangoWeight)arg1);
@@ -16932,36 +15895,36 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1weight)
 #endif
 
 #ifndef NO__1pango_1font_1description_1to_1string
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1to_1string)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1to_1string)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1to_1string_FUNC);
-	rc = (jint)pango_font_description_to_string((PangoFontDescription *)arg0);
+	rc = (jintLong)pango_font_description_to_string((PangoFontDescription *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1to_1string_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1pango_1font_1face_1describe
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1face_1describe)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1face_1describe)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1face_1describe_FUNC);
-	rc = (jint)pango_font_face_describe((PangoFontFace *)arg0);
+	rc = (jintLong)pango_font_face_describe((PangoFontFace *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1face_1describe_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1pango_1font_1family_1get_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1family_1get_1name)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1family_1get_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1family_1get_1name_FUNC);
-	rc = (jint)pango_font_family_get_name((PangoFontFamily *)arg0);
+	rc = (jintLong)pango_font_family_get_name((PangoFontFamily *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1family_1get_1name_FUNC);
 	return rc;
 }
@@ -16969,28 +15932,28 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1family_1get_1name)
 
 #ifndef NO__1pango_1font_1family_1list_1faces
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1family_1list_1faces)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1family_1list_1faces_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	pango_font_family_list_faces((PangoFontFamily *)arg0, (PangoFontFace ***)lparg1, (int *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1family_1list_1faces_FUNC);
 }
 #endif
 
 #ifndef NO__1pango_1font_1get_1metrics
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1get_1metrics)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1get_1metrics)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1get_1metrics_FUNC);
-	rc = (jint)pango_font_get_metrics((PangoFont *)arg0, (PangoLanguage *)arg1);
+	rc = (jintLong)pango_font_get_metrics((PangoFont *)arg0, (PangoLanguage *)arg1);
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1get_1metrics_FUNC);
 	return rc;
 }
@@ -16998,7 +15961,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1get_1metrics)
 
 #ifndef NO__1pango_1font_1metrics_1get_1approximate_1char_1width
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1approximate_1char_1width)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1approximate_1char_1width_FUNC);
@@ -17010,7 +15973,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1approximate_1char_
 
 #ifndef NO__1pango_1font_1metrics_1get_1ascent
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1ascent)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1ascent_FUNC);
@@ -17022,7 +15985,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1ascent)
 
 #ifndef NO__1pango_1font_1metrics_1get_1descent
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1descent)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1descent_FUNC);
@@ -17034,7 +15997,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1descent)
 
 #ifndef NO__1pango_1font_1metrics_1get_1strikethrough_1position
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1position)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1strikethrough_1position_FUNC);
@@ -17042,18 +16005,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1pos
 	rc = (jint)pango_font_metrics_get_strikethrough_position(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_font_metrics_get_strikethrough_position_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_font_metrics_get_strikethrough_position");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, pango_font_metrics_get_strikethrough_position)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1metrics_1get_1strikethrough_1position_FUNC);
@@ -17063,7 +16017,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1pos
 
 #ifndef NO__1pango_1font_1metrics_1get_1strikethrough_1thickness
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1thickness)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1strikethrough_1thickness_FUNC);
@@ -17071,18 +16025,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1thi
 	rc = (jint)pango_font_metrics_get_strikethrough_thickness(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_font_metrics_get_strikethrough_thickness_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_font_metrics_get_strikethrough_thickness");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, pango_font_metrics_get_strikethrough_thickness)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1metrics_1get_1strikethrough_1thickness_FUNC);
@@ -17092,7 +16037,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1thi
 
 #ifndef NO__1pango_1font_1metrics_1get_1underline_1position
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1position)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1underline_1position_FUNC);
@@ -17100,18 +16045,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1positio
 	rc = (jint)pango_font_metrics_get_underline_position(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_font_metrics_get_underline_position_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_font_metrics_get_underline_position");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, pango_font_metrics_get_underline_position)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1metrics_1get_1underline_1position_FUNC);
@@ -17121,7 +16057,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1positio
 
 #ifndef NO__1pango_1font_1metrics_1get_1underline_1thickness
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1thickness)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1underline_1thickness_FUNC);
@@ -17129,18 +16065,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1thickne
 	rc = (jint)pango_font_metrics_get_underline_thickness(arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_font_metrics_get_underline_thickness_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_font_metrics_get_underline_thickness");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0);
+		LOAD_FUNCTION(fp, pango_font_metrics_get_underline_thickness)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1metrics_1get_1underline_1thickness_FUNC);
@@ -17150,7 +16077,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1thickne
 
 #ifndef NO__1pango_1font_1metrics_1unref
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1metrics_1unref)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1unref_FUNC);
 	pango_font_metrics_unref((PangoFontMetrics *)arg0);
@@ -17159,14 +16086,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1metrics_1unref)
 #endif
 
 #ifndef NO__1pango_1language_1from_1string
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1language_1from_1string)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1language_1from_1string)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1language_1from_1string_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)pango_language_from_string((const char *)lparg0);
+	rc = (jintLong)pango_language_from_string((const char *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
 	OS_NATIVE_EXIT(env, that, _1pango_1language_1from_1string_FUNC);
@@ -17176,7 +16103,7 @@ fail:
 
 #ifndef NO__1pango_1layout_1context_1changed
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1context_1changed)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1context_1changed_FUNC);
 	pango_layout_context_changed((PangoLayout *)arg0);
@@ -17186,7 +16113,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1context_1changed)
 
 #ifndef NO__1pango_1layout_1get_1alignment
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1alignment)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1alignment_FUNC);
@@ -17197,24 +16124,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1alignment)
 #endif
 
 #ifndef NO__1pango_1layout_1get_1attributes
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1attributes)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1attributes)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1attributes_FUNC);
-	rc = (jint)pango_layout_get_attributes((PangoLayout *)arg0);
+	rc = (jintLong)pango_layout_get_attributes((PangoLayout *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1attributes_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1pango_1layout_1get_1context
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1context)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1context)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1context_FUNC);
-	rc = (jint)pango_layout_get_context((PangoLayout *)arg0);
+	rc = (jintLong)pango_layout_get_context((PangoLayout *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1context_FUNC);
 	return rc;
 }
@@ -17222,7 +16149,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1context)
 
 #ifndef NO__1pango_1layout_1get_1indent
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1indent)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1indent_FUNC);
@@ -17233,12 +16160,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1indent)
 #endif
 
 #ifndef NO__1pango_1layout_1get_1iter
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1iter)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1iter)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1iter_FUNC);
-	rc = (jint)pango_layout_get_iter((PangoLayout*)arg0);
+	rc = (jintLong)pango_layout_get_iter((PangoLayout*)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1iter_FUNC);
 	return rc;
 }
@@ -17246,7 +16173,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1iter)
 
 #ifndef NO__1pango_1layout_1get_1justify
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1get_1justify)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1justify_FUNC);
@@ -17257,12 +16184,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1get_1justify)
 #endif
 
 #ifndef NO__1pango_1layout_1get_1line
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1line)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1line_FUNC);
-	rc = (jint)pango_layout_get_line((PangoLayout *)arg0, arg1);
+	rc = (jintLong)pango_layout_get_line((PangoLayout *)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1line_FUNC);
 	return rc;
 }
@@ -17270,7 +16197,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line)
 
 #ifndef NO__1pango_1layout_1get_1line_1count
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line_1count)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1line_1count_FUNC);
@@ -17282,24 +16209,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line_1count)
 
 #ifndef NO__1pango_1layout_1get_1log_1attrs
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1get_1log_1attrs)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1log_1attrs_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	pango_layout_get_log_attrs((PangoLayout*)arg0, (PangoLogAttr **)lparg1, (int *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1log_1attrs_FUNC);
 }
 #endif
 
 #ifndef NO__1pango_1layout_1get_1size
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1get_1size)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -17316,7 +16243,7 @@ fail:
 
 #ifndef NO__1pango_1layout_1get_1spacing
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1spacing)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1spacing_FUNC);
@@ -17327,24 +16254,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1spacing)
 #endif
 
 #ifndef NO__1pango_1layout_1get_1tabs
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1tabs)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1tabs)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1tabs_FUNC);
-	rc = (jint)pango_layout_get_tabs((PangoLayout*)arg0);
+	rc = (jintLong)pango_layout_get_tabs((PangoLayout*)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1tabs_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1pango_1layout_1get_1text
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1text)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1text)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1text_FUNC);
-	rc = (jint)pango_layout_get_text((PangoLayout *)arg0);
+	rc = (jintLong)pango_layout_get_text((PangoLayout *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1text_FUNC);
 	return rc;
 }
@@ -17352,7 +16279,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1text)
 
 #ifndef NO__1pango_1layout_1get_1width
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1width)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1width_FUNC);
@@ -17364,7 +16291,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1width)
 
 #ifndef NO__1pango_1layout_1index_1to_1pos
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1index_1to_1pos)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	PangoRectangle _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1index_1to_1pos_FUNC);
@@ -17378,7 +16305,7 @@ fail:
 
 #ifndef NO__1pango_1layout_1iter_1free
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1iter_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1free_FUNC);
 	pango_layout_iter_free((PangoLayoutIter*)arg0);
@@ -17388,7 +16315,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1iter_1free)
 
 #ifndef NO__1pango_1layout_1iter_1get_1index
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1index)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1get_1index_FUNC);
@@ -17400,7 +16327,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1index)
 
 #ifndef NO__1pango_1layout_1iter_1get_1line_1extents
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1line_1extents)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jobject arg2)
 {
 	PangoRectangle _arg1, *lparg1=NULL;
 	PangoRectangle _arg2, *lparg2=NULL;
@@ -17416,12 +16343,12 @@ fail:
 #endif
 
 #ifndef NO__1pango_1layout_1iter_1get_1run
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1run)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1run)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1get_1run_FUNC);
-	rc = (jint)pango_layout_iter_get_run((PangoLayoutIter*)arg0);
+	rc = (jintLong)pango_layout_iter_get_run((PangoLayoutIter*)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1layout_1iter_1get_1run_FUNC);
 	return rc;
 }
@@ -17429,7 +16356,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1run)
 
 #ifndef NO__1pango_1layout_1iter_1next_1line
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1line)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1next_1line_FUNC);
@@ -17441,7 +16368,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1line)
 
 #ifndef NO__1pango_1layout_1iter_1next_1run
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1run)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1next_1run_FUNC);
@@ -17453,7 +16380,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1run)
 
 #ifndef NO__1pango_1layout_1line_1get_1extents
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1line_1get_1extents)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jobject arg2)
 {
 	PangoRectangle _arg1, *lparg1=NULL;
 	PangoRectangle _arg2, *lparg2=NULL;
@@ -17470,7 +16397,7 @@ fail:
 
 #ifndef NO__1pango_1layout_1line_1x_1to_1index
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1line_1x_1to_1index)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
@@ -17488,12 +16415,12 @@ fail:
 #endif
 
 #ifndef NO__1pango_1layout_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1new_FUNC);
-	rc = (jint)pango_layout_new((PangoContext *)arg0);
+	rc = (jintLong)pango_layout_new((PangoContext *)arg0);
 	OS_NATIVE_EXIT(env, that, _1pango_1layout_1new_FUNC);
 	return rc;
 }
@@ -17501,7 +16428,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1new)
 
 #ifndef NO__1pango_1layout_1set_1alignment
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1alignment)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1alignment_FUNC);
 	pango_layout_set_alignment((PangoLayout *)arg0, arg1);
@@ -17511,7 +16438,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1alignment)
 
 #ifndef NO__1pango_1layout_1set_1attributes
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1attributes)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1attributes_FUNC);
 	pango_layout_set_attributes((PangoLayout *)arg0, (PangoAttrList *)arg1);
@@ -17521,24 +16448,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1attributes)
 
 #ifndef NO__1pango_1layout_1set_1auto_1dir
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1auto_1dir)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1auto_1dir_FUNC);
 /*
 	pango_layout_set_auto_dir(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jboolean);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(pango_layout_set_auto_dir_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "pango_layout_set_auto_dir");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, pango_layout_set_auto_dir)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1pango_1layout_1set_1auto_1dir_FUNC);
@@ -17547,7 +16466,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1auto_1dir)
 
 #ifndef NO__1pango_1layout_1set_1font_1description
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1font_1description)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1font_1description_FUNC);
 	pango_layout_set_font_description((PangoLayout *)arg0, (PangoFontDescription *)arg1);
@@ -17557,7 +16476,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1font_1description)
 
 #ifndef NO__1pango_1layout_1set_1indent
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1indent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1indent_FUNC);
 	pango_layout_set_indent((PangoLayout*)arg0, arg1);
@@ -17567,7 +16486,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1indent)
 
 #ifndef NO__1pango_1layout_1set_1justify
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1justify)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1justify_FUNC);
 	pango_layout_set_justify((PangoLayout*)arg0, arg1);
@@ -17577,7 +16496,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1justify)
 
 #ifndef NO__1pango_1layout_1set_1single_1paragraph_1mode
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1single_1paragraph_1mode)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1single_1paragraph_1mode_FUNC);
 	pango_layout_set_single_paragraph_mode((PangoLayout *)arg0, (gboolean)arg1);
@@ -17587,7 +16506,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1single_1paragraph_1mode)
 
 #ifndef NO__1pango_1layout_1set_1spacing
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1spacing)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1spacing_FUNC);
 	pango_layout_set_spacing((PangoLayout *)arg0, arg1);
@@ -17597,7 +16516,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1spacing)
 
 #ifndef NO__1pango_1layout_1set_1tabs
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1tabs)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1tabs_FUNC);
 	pango_layout_set_tabs((PangoLayout *)arg0, (PangoTabArray *)arg1);
@@ -17607,7 +16526,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1tabs)
 
 #ifndef NO__1pango_1layout_1set_1text
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1text)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1text_FUNC);
@@ -17635,7 +16554,7 @@ fail:
 
 #ifndef NO__1pango_1layout_1set_1width
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1width)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1width_FUNC);
 	pango_layout_set_width((PangoLayout *)arg0, arg1);
@@ -17645,7 +16564,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1width)
 
 #ifndef NO__1pango_1layout_1set_1wrap
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1wrap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1wrap_FUNC);
 	pango_layout_set_wrap((PangoLayout *)arg0, arg1);
@@ -17655,7 +16574,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1wrap)
 
 #ifndef NO__1pango_1layout_1xy_1to_1index
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1xy_1to_1index)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
 {
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
@@ -17674,7 +16593,7 @@ fail:
 
 #ifndef NO__1pango_1tab_1array_1free
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1free_FUNC);
 	pango_tab_array_free((PangoTabArray *)arg0);
@@ -17684,7 +16603,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1free)
 
 #ifndef NO__1pango_1tab_1array_1get_1size
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1tab_1array_1get_1size)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1get_1size_FUNC);
@@ -17696,28 +16615,28 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1tab_1array_1get_1size)
 
 #ifndef NO__1pango_1tab_1array_1get_1tabs
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1get_1tabs)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2)
 {
-	jint *lparg1=NULL;
-	jint *lparg2=NULL;
+	jintLong *lparg1=NULL;
+	jintLong *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1get_1tabs_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	pango_tab_array_get_tabs((PangoTabArray *)arg0, (PangoTabAlign **)lparg1, (int **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1pango_1tab_1array_1get_1tabs_FUNC);
 }
 #endif
 
 #ifndef NO__1pango_1tab_1array_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1tab_1array_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1tab_1array_1new)
 	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1new_FUNC);
-	rc = (jint)pango_tab_array_new((gint)arg0, (gboolean)arg1);
+	rc = (jintLong)pango_tab_array_new((gint)arg0, (gboolean)arg1);
 	OS_NATIVE_EXIT(env, that, _1pango_1tab_1array_1new_FUNC);
 	return rc;
 }
@@ -17725,7 +16644,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1tab_1array_1new)
 
 #ifndef NO__1pango_1tab_1array_1set_1tab
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1set_1tab)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1set_1tab_FUNC);
 	pango_tab_array_set_tab((PangoTabArray *)arg0, (gint)arg1, (PangoTabAlign)arg2, (gint)arg3);
@@ -17735,7 +16654,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1set_1tab)
 
 #ifndef NO_g_1main_1context_1wakeup
 JNIEXPORT void JNICALL OS_NATIVE(g_1main_1context_1wakeup)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, g_1main_1context_1wakeup_FUNC);
 	g_main_context_wakeup((GMainContext *)arg0);
@@ -17744,754 +16663,1381 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1main_1context_1wakeup)
 #endif
 
 #ifndef NO_localeconv_1decimal_1point
-JNIEXPORT jint JNICALL OS_NATIVE(localeconv_1decimal_1point)
+JNIEXPORT jintLong JNICALL OS_NATIVE(localeconv_1decimal_1point)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, localeconv_1decimal_1point_FUNC);
-	rc = (jint)localeconv_decimal_point();
+	rc = (jintLong)localeconv_decimal_point();
 	OS_NATIVE_EXIT(env, that, localeconv_1decimal_1point_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	GInterfaceInfo _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getGInterfaceInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
+#endif
 	if (arg1) getGObjectClassFields(env, arg1, (GObjectClass *)arg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	GTypeInfo _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getGTypeInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	GdkEventButton _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getGdkEventButtonFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	GdkEventExpose _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getGdkEventExposeFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	GdkEventMotion _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getGdkEventMotionFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC);
+#endif
 	if (arg1) getGtkAdjustmentFields(env, arg1, (GtkAdjustment *)arg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC);
+#endif
 	if (arg1) getGtkCellRendererClassFields(env, arg1, (GtkCellRendererClass *)arg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC);
+#endif
 	if (arg1) getGtkFixedFields(env, arg1, (GtkFixed *)arg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	GtkTargetEntry _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getGtkTargetEntryFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC);
+#endif
 	if (arg1) getGtkWidgetClassFields(env, arg1, (GtkWidgetClass *)arg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	PangoAttribute _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getPangoAttributeFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	XButtonEvent _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getXButtonEventFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	XClientMessageEvent _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getXClientMessageEventFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	XCrossingEvent _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getXCrossingEventFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	XExposeEvent _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getXExposeEventFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
 {
 	XFocusChangeEvent _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getXFocusChangeEventFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC);
+#endif
 	if (arg0) setGObjectClassFields(env, arg0, (GObjectClass *)arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GTypeQuery _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGTypeQueryFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkColor _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkColorFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkDragContext _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkDragContextFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkEventAny _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkEventAnyFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkEventButton _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkEventButtonFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkEventCrossing _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkEventCrossingFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkEventExpose _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkEventExposeFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkEventFocus _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkEventFocusFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkEventKey _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkEventKeyFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkEventMotion _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkEventMotionFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkEventScroll _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkEventScrollFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkEventVisibility _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkEventVisibilityFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkEventWindowState _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkEventWindowStateFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkEvent _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkEventFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J_FUNC);
+#endif
 	if (arg0) setGdkImageFields(env, arg0, (GdkImage *)arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GdkRectangle _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGdkRectangleFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J_FUNC);
+#endif
 	if (arg0) setGdkVisualFields(env, arg0, (GdkVisual *)arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J_FUNC);
+#endif
 	if (arg0) setGtkAdjustmentFields(env, arg0, (GtkAdjustment *)arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GtkBorder _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGtkBorderFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J_FUNC);
+#endif
 	if (arg0) setGtkCellRendererClassFields(env, arg0, (GtkCellRendererClass *)arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J_FUNC);
+#endif
 	if (arg0) setGtkColorSelectionDialogFields(env, arg0, (GtkColorSelectionDialog *)arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J_FUNC);
+#endif
 	if (arg0) setGtkComboFields(env, arg0, (GtkCombo *)arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J_FUNC);
+#endif
 	if (arg0) setGtkFileSelectionFields(env, arg0, (GtkFileSelection *)arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J_FUNC);
+#endif
 	if (arg0) setGtkFixedFields(env, arg0, (GtkFixed *)arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GtkSelectionData _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGtkSelectionDataFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	GtkTargetPair _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setGtkTargetPairFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J_FUNC);
+#endif
 	if (arg0) setGtkWidgetClassFields(env, arg0, (GtkWidgetClass *)arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	PangoAttrColor _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setPangoAttrColorFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	PangoAttrInt _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setPangoAttrIntFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	PangoAttribute _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setPangoAttributeFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	PangoItem _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setPangoItemFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	PangoLayoutLine _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setPangoLayoutLineFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	PangoLayoutRun _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setPangoLayoutRunFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	PangoLogAttr _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setPangoLogAttrFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	XButtonEvent _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setXButtonEventFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	XCrossingEvent _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setXCrossingEventFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	XExposeEvent _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setXExposeEventFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	XFocusChangeEvent _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setXFocusChangeEventFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
 {
 	XVisibilityEvent _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
 fail:
 	if (arg0 && lparg0) setXVisibilityEventFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO_realpath
-JNIEXPORT jint JNICALL OS_NATIVE(realpath)
+JNIEXPORT jintLong JNICALL OS_NATIVE(realpath)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, realpath_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)realpath((const char *)lparg0, (char *)lparg1);
+	rc = (jintLong)realpath((const char *)lparg0, (char *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
index 948b855ccd..52fea69ee4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
@@ -36,15 +36,15 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GDK_1WINDOWING_1X11)
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1dialog_1new
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new)
-	(JNIEnv *env, jclass that, jbyteArray arg0, SWT_PTR arg1, jint arg2, SWT_PTR arg3, jint arg4, SWT_PTR arg5, jint arg6, SWT_PTR arg7)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLong arg5, jint arg6, jintLong arg7)
 {
 	jbyte *lparg0=NULL;
-	SWT_PTR rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
-	rc = (SWT_PTR)gtk_file_chooser_dialog_new(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+	rc = (jintLong)gtk_file_chooser_dialog_new(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 */
 	{
 		static int initialized = 0;
@@ -57,8 +57,8 @@ JNIEXPORT SWT_PTR JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new)
 		* For some reason, we must also explicitly declare all of the arguments we
 		* are passing in, otherwise it crashes.
 		*/
-/*		typedef SWT_PTR (*FPTR)(jbyte *, SWT_PTR, jint, SWT_PTR, ...); */
-		typedef SWT_PTR (*FPTR)(jbyte *, SWT_PTR, jint, SWT_PTR, jint, SWT_PTR, jint, SWT_PTR, ...);
+/*		typedef jintLong (*FPTR)(jbyte *, jintLong, jint, jintLong, ...); */
+		typedef jintLong (*FPTR)(jbyte *, jintLong, jint, jintLong, jint, jintLong, jint, jintLong, ...);
 		static FPTR fptr;
 		rc = 0;
 		if (!initialized) {
@@ -67,7 +67,7 @@ JNIEXPORT SWT_PTR JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new)
 			initialized = 1;
 		}
 		if (fptr) {
-			rc = (SWT_PTR)(*fptr)(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+			rc = (jintLong)(*fptr)(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 		}
 	}
 fail:
@@ -79,7 +79,7 @@ fail:
 
 #ifndef NO__1gtk_1cell_1layout_1set_1attributes
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1set_1attributes)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTR arg1, jbyteArray arg2, jint arg3, SWT_PTR arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintLong arg4)
 {
 	jbyte *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1set_1attributes_FUNC);
@@ -98,8 +98,8 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1set_1attributes)
 		* For some reason, we must also explicitly declare all of the arguments we
 		* are passing in, otherwise it crashes.
 		*/
-/*		typedef void (*FPTR)(SWT_PTR, SWT_PTR, ...); */
-		typedef void (*FPTR)(SWT_PTR, SWT_PTR, jbyte *, jint, SWT_PTR, ...);
+/*		typedef void (*FPTR)(jintLong, jintLong, ...); */
+		typedef void (*FPTR)(jintLong, jintLong, jbyte *, jint, jintLong, ...);
 		static FPTR fptr;
 		if (!initialized) {
 			if (!handle) handle = dlopen(gtk_cell_layout_set_attributes_LIB, RTLD_LAZY);
@@ -129,7 +129,7 @@ typedef struct _PangoLayoutLineSWT  PangoLayoutLineSWT;
 
 #ifndef NO__1pango_1layout_1line_1get_1resolved_1dir
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1line_1get_1resolved_1dir)
-	(JNIEnv *env, jclass that, SWT_PTR arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1line_1get_1resolved_1dir_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
index 2070f52a17..18d3326bd4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
@@ -232,11 +232,31 @@ char * OS_nativeFunctionNames[] = {
 	"_1g_1object_1get_1qdata",
 	"_1g_1object_1new",
 	"_1g_1object_1ref",
+#ifndef JNI64
 	"_1g_1object_1set__I_3BFI",
+#else
+	"_1g_1object_1set__J_3BFJ",
+#endif
+#ifndef JNI64
 	"_1g_1object_1set__I_3BII",
+#else
+	"_1g_1object_1set__J_3BIJ",
+#endif
+#ifndef JNI64
 	"_1g_1object_1set__I_3BJI",
+#else
+	"_1g_1object_1set__J_3BJJ",
+#endif
+#ifndef JNI64
 	"_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I",
+#else
+	"_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J",
+#endif
+#ifndef JNI64
 	"_1g_1object_1set__I_3BZI",
+#else
+	"_1g_1object_1set__J_3BZJ",
+#endif
 	"_1g_1object_1set_1qdata",
 	"_1g_1object_1unref",
 	"_1g_1quark_1from_1string",
@@ -246,10 +266,26 @@ char * OS_nativeFunctionNames[] = {
 	"_1g_1signal_1connect_1after",
 	"_1g_1signal_1connect_1closure",
 	"_1g_1signal_1connect_1closure_1by_1id",
+#ifndef JNI64
 	"_1g_1signal_1emit_1by_1name__I_3B",
+#else
+	"_1g_1signal_1emit_1by_1name__J_3B",
+#endif
+#ifndef JNI64
 	"_1g_1signal_1emit_1by_1name__I_3BI",
+#else
+	"_1g_1signal_1emit_1by_1name__J_3BJ",
+#endif
+#ifndef JNI64
 	"_1g_1signal_1emit_1by_1name__I_3BII",
+#else
+	"_1g_1signal_1emit_1by_1name__J_3BJJ",
+#endif
+#ifndef JNI64
 	"_1g_1signal_1emit_1by_1name__I_3B_3B",
+#else
+	"_1g_1signal_1emit_1by_1name__J_3B_3B",
+#endif
 	"_1g_1signal_1handler_1disconnect",
 	"_1g_1signal_1handlers_1block_1matched",
 	"_1g_1signal_1handlers_1disconnect_1matched",
@@ -280,8 +316,16 @@ char * OS_nativeFunctionNames[] = {
 	"_1g_1utf8_1offset_1to_1pointer",
 	"_1g_1utf8_1pointer_1to_1offset",
 	"_1g_1utf8_1strlen",
+#ifndef JNI64
 	"_1g_1utf8_1to_1utf16__II_3I_3I_3I",
+#else
+	"_1g_1utf8_1to_1utf16__JJ_3J_3J_3J",
+#endif
+#ifndef JNI64
 	"_1g_1utf8_1to_1utf16___3BI_3I_3I_3I",
+#else
+	"_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J",
+#endif
 	"_1g_1value_1peek_1pointer",
 	"_1gdk_1atom_1intern",
 	"_1gdk_1atom_1name",
@@ -653,8 +697,16 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1label_1set_1justify",
 	"_1gtk_1label_1set_1line_1wrap",
 	"_1gtk_1label_1set_1line_1wrap_1mode",
+#ifndef JNI64
 	"_1gtk_1label_1set_1text__II",
+#else
+	"_1gtk_1label_1set_1text__JJ",
+#endif
+#ifndef JNI64
 	"_1gtk_1label_1set_1text__I_3B",
+#else
+	"_1gtk_1label_1set_1text__J_3B",
+#endif
 	"_1gtk_1label_1set_1text_1with_1mnemonic",
 	"_1gtk_1list_1append_1items",
 	"_1gtk_1list_1clear_1items",
@@ -667,11 +719,31 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1list_1store_1insert",
 	"_1gtk_1list_1store_1newv",
 	"_1gtk_1list_1store_1remove",
+#ifndef JNI64
 	"_1gtk_1list_1store_1set__IIIII",
+#else
+	"_1gtk_1list_1store_1set__JJIIJ",
+#endif
+#ifndef JNI64
 	"_1gtk_1list_1store_1set__IIIJI",
+#else
+	"_1gtk_1list_1store_1set__JJIJJ",
+#endif
+#ifndef JNI64
 	"_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I",
+#else
+	"_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J",
+#endif
+#ifndef JNI64
 	"_1gtk_1list_1store_1set__IIIZI",
+#else
+	"_1gtk_1list_1store_1set__JJIZJ",
+#endif
+#ifndef JNI64
 	"_1gtk_1list_1store_1set__III_3BI",
+#else
+	"_1gtk_1list_1store_1set__JJI_3BJ",
+#endif
 	"_1gtk_1list_1unselect_1all",
 	"_1gtk_1list_1unselect_1item",
 	"_1gtk_1main",
@@ -875,8 +947,16 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1text_1buffer_1get_1selection_1bound",
 	"_1gtk_1text_1buffer_1get_1selection_1bounds",
 	"_1gtk_1text_1buffer_1get_1text",
+#ifndef JNI64
 	"_1gtk_1text_1buffer_1insert__II_3BI",
+#else
+	"_1gtk_1text_1buffer_1insert__JJ_3BI",
+#endif
+#ifndef JNI64
 	"_1gtk_1text_1buffer_1insert__I_3B_3BI",
+#else
+	"_1gtk_1text_1buffer_1insert__J_3B_3BI",
+#endif
 	"_1gtk_1text_1buffer_1move_1mark",
 	"_1gtk_1text_1buffer_1paste_1clipboard",
 	"_1gtk_1text_1buffer_1place_1cursor",
@@ -917,8 +997,16 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1tooltips_1force_1window",
 	"_1gtk_1tooltips_1new",
 	"_1gtk_1tooltips_1set_1tip",
+#ifndef JNI64
 	"_1gtk_1tree_1model_1get__III_3II",
+#else
+	"_1gtk_1tree_1model_1get__JJI_3IJ",
+#endif
+#ifndef JNI64
 	"_1gtk_1tree_1model_1get__III_3JI",
+#else
+	"_1gtk_1tree_1model_1get__JJI_3JJ",
+#endif
 	"_1gtk_1tree_1model_1get_1iter",
 	"_1gtk_1tree_1model_1get_1iter_1first",
 	"_1gtk_1tree_1model_1get_1n_1columns",
@@ -936,7 +1024,11 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1tree_1path_1get_1indices",
 	"_1gtk_1tree_1path_1new",
 	"_1gtk_1tree_1path_1new_1first",
+#ifndef JNI64
 	"_1gtk_1tree_1path_1new_1from_1string__I",
+#else
+	"_1gtk_1tree_1path_1new_1from_1string__J",
+#endif
 	"_1gtk_1tree_1path_1new_1from_1string___3B",
 	"_1gtk_1tree_1path_1next",
 	"_1gtk_1tree_1path_1prev",
@@ -956,11 +1048,31 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1tree_1store_1insert",
 	"_1gtk_1tree_1store_1newv",
 	"_1gtk_1tree_1store_1remove",
+#ifndef JNI64
 	"_1gtk_1tree_1store_1set__IIIII",
+#else
+	"_1gtk_1tree_1store_1set__JJIIJ",
+#endif
+#ifndef JNI64
 	"_1gtk_1tree_1store_1set__IIIJI",
+#else
+	"_1gtk_1tree_1store_1set__JJIJJ",
+#endif
+#ifndef JNI64
 	"_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I",
+#else
+	"_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J",
+#endif
+#ifndef JNI64
 	"_1gtk_1tree_1store_1set__IIIZI",
+#else
+	"_1gtk_1tree_1store_1set__JJIZJ",
+#endif
+#ifndef JNI64
 	"_1gtk_1tree_1store_1set__III_3BI",
+#else
+	"_1gtk_1tree_1store_1set__JJI_3BJ",
+#endif
 	"_1gtk_1tree_1view_1collapse_1row",
 	"_1gtk_1tree_1view_1column_1add_1attribute",
 	"_1gtk_1tree_1view_1column_1cell_1get_1position",
@@ -1034,8 +1146,16 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1widget_1add_1accelerator",
 	"_1gtk_1widget_1add_1events",
 	"_1gtk_1widget_1child_1focus",
+#ifndef JNI64
 	"_1gtk_1widget_1create_1pango_1layout__II",
+#else
+	"_1gtk_1widget_1create_1pango_1layout__JJ",
+#endif
+#ifndef JNI64
 	"_1gtk_1widget_1create_1pango_1layout__I_3B",
+#else
+	"_1gtk_1widget_1create_1pango_1layout__J_3B",
+#endif
 	"_1gtk_1widget_1destroy",
 	"_1gtk_1widget_1event",
 	"_1gtk_1widget_1get_1accessible",
@@ -1084,8 +1204,16 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1widget_1show_1now",
 	"_1gtk_1widget_1size_1allocate",
 	"_1gtk_1widget_1size_1request",
+#ifndef JNI64
 	"_1gtk_1widget_1style_1get__I_3B_3II",
+#else
+	"_1gtk_1widget_1style_1get__J_3B_3IJ",
+#endif
+#ifndef JNI64
 	"_1gtk_1widget_1style_1get__I_3B_3JI",
+#else
+	"_1gtk_1widget_1style_1get__J_3B_3JJ",
+#endif
 	"_1gtk_1widget_1translate_1coordinates",
 	"_1gtk_1widget_1unrealize",
 	"_1gtk_1window_1activate_1default",
@@ -1233,63 +1361,291 @@ char * OS_nativeFunctionNames[] = {
 	"_1pango_1tab_1array_1set_1tab",
 	"g_1main_1context_1wakeup",
 	"localeconv_1decimal_1point",
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J",
+#endif
+#ifndef JNI64
 	"memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I",
+#else
+	"memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ",
+#endif
+#ifndef JNI64
 	"memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II",
+#else
+	"memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ",
+#endif
 	"realpath",
 };
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
index ddc53cb5d2..9156b98dac 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
@@ -240,11 +240,31 @@ typedef enum {
 	_1g_1object_1get_1qdata_FUNC,
 	_1g_1object_1new_FUNC,
 	_1g_1object_1ref_FUNC,
+#ifndef JNI64
 	_1g_1object_1set__I_3BFI_FUNC,
+#else
+	_1g_1object_1set__J_3BFJ_FUNC,
+#endif
+#ifndef JNI64
 	_1g_1object_1set__I_3BII_FUNC,
+#else
+	_1g_1object_1set__J_3BIJ_FUNC,
+#endif
+#ifndef JNI64
 	_1g_1object_1set__I_3BJI_FUNC,
+#else
+	_1g_1object_1set__J_3BJJ_FUNC,
+#endif
+#ifndef JNI64
 	_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC,
+#else
+	_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC,
+#endif
+#ifndef JNI64
 	_1g_1object_1set__I_3BZI_FUNC,
+#else
+	_1g_1object_1set__J_3BZJ_FUNC,
+#endif
 	_1g_1object_1set_1qdata_FUNC,
 	_1g_1object_1unref_FUNC,
 	_1g_1quark_1from_1string_FUNC,
@@ -254,10 +274,26 @@ typedef enum {
 	_1g_1signal_1connect_1after_FUNC,
 	_1g_1signal_1connect_1closure_FUNC,
 	_1g_1signal_1connect_1closure_1by_1id_FUNC,
+#ifndef JNI64
 	_1g_1signal_1emit_1by_1name__I_3B_FUNC,
+#else
+	_1g_1signal_1emit_1by_1name__J_3B_FUNC,
+#endif
+#ifndef JNI64
 	_1g_1signal_1emit_1by_1name__I_3BI_FUNC,
+#else
+	_1g_1signal_1emit_1by_1name__J_3BJ_FUNC,
+#endif
+#ifndef JNI64
 	_1g_1signal_1emit_1by_1name__I_3BII_FUNC,
+#else
+	_1g_1signal_1emit_1by_1name__J_3BJJ_FUNC,
+#endif
+#ifndef JNI64
 	_1g_1signal_1emit_1by_1name__I_3B_3B_FUNC,
+#else
+	_1g_1signal_1emit_1by_1name__J_3B_3B_FUNC,
+#endif
 	_1g_1signal_1handler_1disconnect_FUNC,
 	_1g_1signal_1handlers_1block_1matched_FUNC,
 	_1g_1signal_1handlers_1disconnect_1matched_FUNC,
@@ -288,8 +324,16 @@ typedef enum {
 	_1g_1utf8_1offset_1to_1pointer_FUNC,
 	_1g_1utf8_1pointer_1to_1offset_FUNC,
 	_1g_1utf8_1strlen_FUNC,
+#ifndef JNI64
 	_1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC,
+#else
+	_1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC,
+#endif
+#ifndef JNI64
 	_1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC,
+#else
+	_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC,
+#endif
 	_1g_1value_1peek_1pointer_FUNC,
 	_1gdk_1atom_1intern_FUNC,
 	_1gdk_1atom_1name_FUNC,
@@ -661,8 +705,16 @@ typedef enum {
 	_1gtk_1label_1set_1justify_FUNC,
 	_1gtk_1label_1set_1line_1wrap_FUNC,
 	_1gtk_1label_1set_1line_1wrap_1mode_FUNC,
+#ifndef JNI64
 	_1gtk_1label_1set_1text__II_FUNC,
+#else
+	_1gtk_1label_1set_1text__JJ_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1label_1set_1text__I_3B_FUNC,
+#else
+	_1gtk_1label_1set_1text__J_3B_FUNC,
+#endif
 	_1gtk_1label_1set_1text_1with_1mnemonic_FUNC,
 	_1gtk_1list_1append_1items_FUNC,
 	_1gtk_1list_1clear_1items_FUNC,
@@ -675,11 +727,31 @@ typedef enum {
 	_1gtk_1list_1store_1insert_FUNC,
 	_1gtk_1list_1store_1newv_FUNC,
 	_1gtk_1list_1store_1remove_FUNC,
+#ifndef JNI64
 	_1gtk_1list_1store_1set__IIIII_FUNC,
+#else
+	_1gtk_1list_1store_1set__JJIIJ_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1list_1store_1set__IIIJI_FUNC,
+#else
+	_1gtk_1list_1store_1set__JJIJJ_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC,
+#else
+	_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1list_1store_1set__IIIZI_FUNC,
+#else
+	_1gtk_1list_1store_1set__JJIZJ_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1list_1store_1set__III_3BI_FUNC,
+#else
+	_1gtk_1list_1store_1set__JJI_3BJ_FUNC,
+#endif
 	_1gtk_1list_1unselect_1all_FUNC,
 	_1gtk_1list_1unselect_1item_FUNC,
 	_1gtk_1main_FUNC,
@@ -883,8 +955,16 @@ typedef enum {
 	_1gtk_1text_1buffer_1get_1selection_1bound_FUNC,
 	_1gtk_1text_1buffer_1get_1selection_1bounds_FUNC,
 	_1gtk_1text_1buffer_1get_1text_FUNC,
+#ifndef JNI64
 	_1gtk_1text_1buffer_1insert__II_3BI_FUNC,
+#else
+	_1gtk_1text_1buffer_1insert__JJ_3BI_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC,
+#else
+	_1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC,
+#endif
 	_1gtk_1text_1buffer_1move_1mark_FUNC,
 	_1gtk_1text_1buffer_1paste_1clipboard_FUNC,
 	_1gtk_1text_1buffer_1place_1cursor_FUNC,
@@ -925,8 +1005,16 @@ typedef enum {
 	_1gtk_1tooltips_1force_1window_FUNC,
 	_1gtk_1tooltips_1new_FUNC,
 	_1gtk_1tooltips_1set_1tip_FUNC,
+#ifndef JNI64
 	_1gtk_1tree_1model_1get__III_3II_FUNC,
+#else
+	_1gtk_1tree_1model_1get__JJI_3IJ_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1tree_1model_1get__III_3JI_FUNC,
+#else
+	_1gtk_1tree_1model_1get__JJI_3JJ_FUNC,
+#endif
 	_1gtk_1tree_1model_1get_1iter_FUNC,
 	_1gtk_1tree_1model_1get_1iter_1first_FUNC,
 	_1gtk_1tree_1model_1get_1n_1columns_FUNC,
@@ -944,7 +1032,11 @@ typedef enum {
 	_1gtk_1tree_1path_1get_1indices_FUNC,
 	_1gtk_1tree_1path_1new_FUNC,
 	_1gtk_1tree_1path_1new_1first_FUNC,
+#ifndef JNI64
 	_1gtk_1tree_1path_1new_1from_1string__I_FUNC,
+#else
+	_1gtk_1tree_1path_1new_1from_1string__J_FUNC,
+#endif
 	_1gtk_1tree_1path_1new_1from_1string___3B_FUNC,
 	_1gtk_1tree_1path_1next_FUNC,
 	_1gtk_1tree_1path_1prev_FUNC,
@@ -964,11 +1056,31 @@ typedef enum {
 	_1gtk_1tree_1store_1insert_FUNC,
 	_1gtk_1tree_1store_1newv_FUNC,
 	_1gtk_1tree_1store_1remove_FUNC,
+#ifndef JNI64
 	_1gtk_1tree_1store_1set__IIIII_FUNC,
+#else
+	_1gtk_1tree_1store_1set__JJIIJ_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1tree_1store_1set__IIIJI_FUNC,
+#else
+	_1gtk_1tree_1store_1set__JJIJJ_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC,
+#else
+	_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1tree_1store_1set__IIIZI_FUNC,
+#else
+	_1gtk_1tree_1store_1set__JJIZJ_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1tree_1store_1set__III_3BI_FUNC,
+#else
+	_1gtk_1tree_1store_1set__JJI_3BJ_FUNC,
+#endif
 	_1gtk_1tree_1view_1collapse_1row_FUNC,
 	_1gtk_1tree_1view_1column_1add_1attribute_FUNC,
 	_1gtk_1tree_1view_1column_1cell_1get_1position_FUNC,
@@ -1042,8 +1154,16 @@ typedef enum {
 	_1gtk_1widget_1add_1accelerator_FUNC,
 	_1gtk_1widget_1add_1events_FUNC,
 	_1gtk_1widget_1child_1focus_FUNC,
+#ifndef JNI64
 	_1gtk_1widget_1create_1pango_1layout__II_FUNC,
+#else
+	_1gtk_1widget_1create_1pango_1layout__JJ_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1widget_1create_1pango_1layout__I_3B_FUNC,
+#else
+	_1gtk_1widget_1create_1pango_1layout__J_3B_FUNC,
+#endif
 	_1gtk_1widget_1destroy_FUNC,
 	_1gtk_1widget_1event_FUNC,
 	_1gtk_1widget_1get_1accessible_FUNC,
@@ -1092,8 +1212,16 @@ typedef enum {
 	_1gtk_1widget_1show_1now_FUNC,
 	_1gtk_1widget_1size_1allocate_FUNC,
 	_1gtk_1widget_1size_1request_FUNC,
+#ifndef JNI64
 	_1gtk_1widget_1style_1get__I_3B_3II_FUNC,
+#else
+	_1gtk_1widget_1style_1get__J_3B_3IJ_FUNC,
+#endif
+#ifndef JNI64
 	_1gtk_1widget_1style_1get__I_3B_3JI_FUNC,
+#else
+	_1gtk_1widget_1style_1get__J_3B_3JJ_FUNC,
+#endif
 	_1gtk_1widget_1translate_1coordinates_FUNC,
 	_1gtk_1widget_1unrealize_FUNC,
 	_1gtk_1window_1activate_1default_FUNC,
@@ -1241,62 +1369,290 @@ typedef enum {
 	_1pango_1tab_1array_1set_1tab_FUNC,
 	g_1main_1context_1wakeup_FUNC,
 	localeconv_1decimal_1point_FUNC,
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC,
+#else
+	memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II_FUNC,
+#else
+	memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ_FUNC,
+#endif
 	realpath_FUNC,
 } OS_FUNCS;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
index b811d12dfb..5ef3c535af 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
@@ -29,27 +29,27 @@ void cacheGInterfaceInfoFields(JNIEnv *env, jobject lpObject)
 {
 	if (GInterfaceInfoFc.cached) return;
 	GInterfaceInfoFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GInterfaceInfoFc.interface_init = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_init", "I");
-	GInterfaceInfoFc.interface_finalize = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_finalize", "I");
-	GInterfaceInfoFc.interface_data = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_data", "I");
+	GInterfaceInfoFc.interface_init = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_init", I_J);
+	GInterfaceInfoFc.interface_finalize = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_finalize", I_J);
+	GInterfaceInfoFc.interface_data = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_data", I_J);
 	GInterfaceInfoFc.cached = 1;
 }
 
 GInterfaceInfo *getGInterfaceInfoFields(JNIEnv *env, jobject lpObject, GInterfaceInfo *lpStruct)
 {
 	if (!GInterfaceInfoFc.cached) cacheGInterfaceInfoFields(env, lpObject);
-	lpStruct->interface_init = (GInterfaceInitFunc)(*env)->GetIntField(env, lpObject, GInterfaceInfoFc.interface_init);
-	lpStruct->interface_finalize = (GInterfaceFinalizeFunc)(*env)->GetIntField(env, lpObject, GInterfaceInfoFc.interface_finalize);
-	lpStruct->interface_data = (gpointer)(*env)->GetIntField(env, lpObject, GInterfaceInfoFc.interface_data);
+	lpStruct->interface_init = (GInterfaceInitFunc)(*env)->GetIntLongField(env, lpObject, GInterfaceInfoFc.interface_init);
+	lpStruct->interface_finalize = (GInterfaceFinalizeFunc)(*env)->GetIntLongField(env, lpObject, GInterfaceInfoFc.interface_finalize);
+	lpStruct->interface_data = (gpointer)(*env)->GetIntLongField(env, lpObject, GInterfaceInfoFc.interface_data);
 	return lpStruct;
 }
 
 void setGInterfaceInfoFields(JNIEnv *env, jobject lpObject, GInterfaceInfo *lpStruct)
 {
 	if (!GInterfaceInfoFc.cached) cacheGInterfaceInfoFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GInterfaceInfoFc.interface_init, (jint)lpStruct->interface_init);
-	(*env)->SetIntField(env, lpObject, GInterfaceInfoFc.interface_finalize, (jint)lpStruct->interface_finalize);
-	(*env)->SetIntField(env, lpObject, GInterfaceInfoFc.interface_data, (jint)lpStruct->interface_data);
+	(*env)->SetIntLongField(env, lpObject, GInterfaceInfoFc.interface_init, (jintLong)lpStruct->interface_init);
+	(*env)->SetIntLongField(env, lpObject, GInterfaceInfoFc.interface_finalize, (jintLong)lpStruct->interface_finalize);
+	(*env)->SetIntLongField(env, lpObject, GInterfaceInfoFc.interface_data, (jintLong)lpStruct->interface_data);
 }
 #endif
 
@@ -66,39 +66,39 @@ void cacheGObjectClassFields(JNIEnv *env, jobject lpObject)
 {
 	if (GObjectClassFc.cached) return;
 	GObjectClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GObjectClassFc.constructor = (*env)->GetFieldID(env, GObjectClassFc.clazz, "constructor", "I");
-	GObjectClassFc.set_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "set_property", "I");
-	GObjectClassFc.get_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "get_property", "I");
-	GObjectClassFc.dispose = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispose", "I");
-	GObjectClassFc.finalize = (*env)->GetFieldID(env, GObjectClassFc.clazz, "finalize", "I");
-	GObjectClassFc.dispatch_properties_changed = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispatch_properties_changed", "I");
-	GObjectClassFc.notify = (*env)->GetFieldID(env, GObjectClassFc.clazz, "notify", "I");
+	GObjectClassFc.constructor = (*env)->GetFieldID(env, GObjectClassFc.clazz, "constructor", I_J);
+	GObjectClassFc.set_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "set_property", I_J);
+	GObjectClassFc.get_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "get_property", I_J);
+	GObjectClassFc.dispose = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispose", I_J);
+	GObjectClassFc.finalize = (*env)->GetFieldID(env, GObjectClassFc.clazz, "finalize", I_J);
+	GObjectClassFc.dispatch_properties_changed = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispatch_properties_changed", I_J);
+	GObjectClassFc.notify = (*env)->GetFieldID(env, GObjectClassFc.clazz, "notify", I_J);
 	GObjectClassFc.cached = 1;
 }
 
 GObjectClass *getGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct)
 {
 	if (!GObjectClassFc.cached) cacheGObjectClassFields(env, lpObject);
-	lpStruct->constructor = (GObject *(*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.constructor);
-	lpStruct->set_property = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.set_property);
-	lpStruct->get_property = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.get_property);
-	lpStruct->dispose = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.dispose);
-	lpStruct->finalize = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.finalize);
-	lpStruct->dispatch_properties_changed = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.dispatch_properties_changed);
-	lpStruct->notify = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.notify);
+	lpStruct->constructor = (GObject *(*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.constructor);
+	lpStruct->set_property = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.set_property);
+	lpStruct->get_property = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.get_property);
+	lpStruct->dispose = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.dispose);
+	lpStruct->finalize = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.finalize);
+	lpStruct->dispatch_properties_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed);
+	lpStruct->notify = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.notify);
 	return lpStruct;
 }
 
 void setGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct)
 {
 	if (!GObjectClassFc.cached) cacheGObjectClassFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GObjectClassFc.constructor, (jint)lpStruct->constructor);
-	(*env)->SetIntField(env, lpObject, GObjectClassFc.set_property, (jint)lpStruct->set_property);
-	(*env)->SetIntField(env, lpObject, GObjectClassFc.get_property, (jint)lpStruct->get_property);
-	(*env)->SetIntField(env, lpObject, GObjectClassFc.dispose, (jint)lpStruct->dispose);
-	(*env)->SetIntField(env, lpObject, GObjectClassFc.finalize, (jint)lpStruct->finalize);
-	(*env)->SetIntField(env, lpObject, GObjectClassFc.dispatch_properties_changed, (jint)lpStruct->dispatch_properties_changed);
-	(*env)->SetIntField(env, lpObject, GObjectClassFc.notify, (jint)lpStruct->notify);
+	(*env)->SetIntLongField(env, lpObject, GObjectClassFc.constructor, (jintLong)lpStruct->constructor);
+	(*env)->SetIntLongField(env, lpObject, GObjectClassFc.set_property, (jintLong)lpStruct->set_property);
+	(*env)->SetIntLongField(env, lpObject, GObjectClassFc.get_property, (jintLong)lpStruct->get_property);
+	(*env)->SetIntLongField(env, lpObject, GObjectClassFc.dispose, (jintLong)lpStruct->dispose);
+	(*env)->SetIntLongField(env, lpObject, GObjectClassFc.finalize, (jintLong)lpStruct->finalize);
+	(*env)->SetIntLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed, (jintLong)lpStruct->dispatch_properties_changed);
+	(*env)->SetIntLongField(env, lpObject, GObjectClassFc.notify, (jintLong)lpStruct->notify);
 }
 #endif
 
@@ -116,15 +116,15 @@ void cacheGTypeInfoFields(JNIEnv *env, jobject lpObject)
 	if (GTypeInfoFc.cached) return;
 	GTypeInfoFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	GTypeInfoFc.class_size = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_size", "S");
-	GTypeInfoFc.base_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_init", "I");
-	GTypeInfoFc.base_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_finalize", "I");
-	GTypeInfoFc.class_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_init", "I");
-	GTypeInfoFc.class_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_finalize", "I");
-	GTypeInfoFc.class_data = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_data", "I");
+	GTypeInfoFc.base_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_init", I_J);
+	GTypeInfoFc.base_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_finalize", I_J);
+	GTypeInfoFc.class_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_init", I_J);
+	GTypeInfoFc.class_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_finalize", I_J);
+	GTypeInfoFc.class_data = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_data", I_J);
 	GTypeInfoFc.instance_size = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "instance_size", "S");
 	GTypeInfoFc.n_preallocs = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "n_preallocs", "S");
-	GTypeInfoFc.instance_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "instance_init", "I");
-	GTypeInfoFc.value_table = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "value_table", "I");
+	GTypeInfoFc.instance_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "instance_init", I_J);
+	GTypeInfoFc.value_table = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "value_table", I_J);
 	GTypeInfoFc.cached = 1;
 }
 
@@ -132,15 +132,15 @@ GTypeInfo *getGTypeInfoFields(JNIEnv *env, jobject lpObject, GTypeInfo *lpStruct
 {
 	if (!GTypeInfoFc.cached) cacheGTypeInfoFields(env, lpObject);
 	lpStruct->class_size = (guint16)(*env)->GetShortField(env, lpObject, GTypeInfoFc.class_size);
-	lpStruct->base_init = (GBaseInitFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.base_init);
-	lpStruct->base_finalize = (GBaseFinalizeFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.base_finalize);
-	lpStruct->class_init = (GClassInitFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.class_init);
-	lpStruct->class_finalize = (GClassFinalizeFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.class_finalize);
-	lpStruct->class_data = (gconstpointer)(*env)->GetIntField(env, lpObject, GTypeInfoFc.class_data);
+	lpStruct->base_init = (GBaseInitFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.base_init);
+	lpStruct->base_finalize = (GBaseFinalizeFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.base_finalize);
+	lpStruct->class_init = (GClassInitFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.class_init);
+	lpStruct->class_finalize = (GClassFinalizeFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.class_finalize);
+	lpStruct->class_data = (gconstpointer)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.class_data);
 	lpStruct->instance_size = (guint16)(*env)->GetShortField(env, lpObject, GTypeInfoFc.instance_size);
 	lpStruct->n_preallocs = (guint16)(*env)->GetShortField(env, lpObject, GTypeInfoFc.n_preallocs);
-	lpStruct->instance_init = (GInstanceInitFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.instance_init);
-	lpStruct->value_table = (GTypeValueTable *)(*env)->GetIntField(env, lpObject, GTypeInfoFc.value_table);
+	lpStruct->instance_init = (GInstanceInitFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.instance_init);
+	lpStruct->value_table = (GTypeValueTable *)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.value_table);
 	return lpStruct;
 }
 
@@ -148,15 +148,15 @@ void setGTypeInfoFields(JNIEnv *env, jobject lpObject, GTypeInfo *lpStruct)
 {
 	if (!GTypeInfoFc.cached) cacheGTypeInfoFields(env, lpObject);
 	(*env)->SetShortField(env, lpObject, GTypeInfoFc.class_size, (jshort)lpStruct->class_size);
-	(*env)->SetIntField(env, lpObject, GTypeInfoFc.base_init, (jint)lpStruct->base_init);
-	(*env)->SetIntField(env, lpObject, GTypeInfoFc.base_finalize, (jint)lpStruct->base_finalize);
-	(*env)->SetIntField(env, lpObject, GTypeInfoFc.class_init, (jint)lpStruct->class_init);
-	(*env)->SetIntField(env, lpObject, GTypeInfoFc.class_finalize, (jint)lpStruct->class_finalize);
-	(*env)->SetIntField(env, lpObject, GTypeInfoFc.class_data, (jint)lpStruct->class_data);
+	(*env)->SetIntLongField(env, lpObject, GTypeInfoFc.base_init, (jintLong)lpStruct->base_init);
+	(*env)->SetIntLongField(env, lpObject, GTypeInfoFc.base_finalize, (jintLong)lpStruct->base_finalize);
+	(*env)->SetIntLongField(env, lpObject, GTypeInfoFc.class_init, (jintLong)lpStruct->class_init);
+	(*env)->SetIntLongField(env, lpObject, GTypeInfoFc.class_finalize, (jintLong)lpStruct->class_finalize);
+	(*env)->SetIntLongField(env, lpObject, GTypeInfoFc.class_data, (jintLong)lpStruct->class_data);
 	(*env)->SetShortField(env, lpObject, GTypeInfoFc.instance_size, (jshort)lpStruct->instance_size);
 	(*env)->SetShortField(env, lpObject, GTypeInfoFc.n_preallocs, (jshort)lpStruct->n_preallocs);
-	(*env)->SetIntField(env, lpObject, GTypeInfoFc.instance_init, (jint)lpStruct->instance_init);
-	(*env)->SetIntField(env, lpObject, GTypeInfoFc.value_table, (jint)lpStruct->value_table);
+	(*env)->SetIntLongField(env, lpObject, GTypeInfoFc.instance_init, (jintLong)lpStruct->instance_init);
+	(*env)->SetIntLongField(env, lpObject, GTypeInfoFc.value_table, (jintLong)lpStruct->value_table);
 }
 #endif
 
@@ -174,7 +174,7 @@ void cacheGTypeQueryFields(JNIEnv *env, jobject lpObject)
 	if (GTypeQueryFc.cached) return;
 	GTypeQueryFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	GTypeQueryFc.type = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type", "I");
-	GTypeQueryFc.type_name = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type_name", "I");
+	GTypeQueryFc.type_name = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type_name", I_J);
 	GTypeQueryFc.class_size = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "class_size", "I");
 	GTypeQueryFc.instance_size = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "instance_size", "I");
 	GTypeQueryFc.cached = 1;
@@ -184,7 +184,7 @@ GTypeQuery *getGTypeQueryFields(JNIEnv *env, jobject lpObject, GTypeQuery *lpStr
 {
 	if (!GTypeQueryFc.cached) cacheGTypeQueryFields(env, lpObject);
 	lpStruct->type = (GType)(*env)->GetIntField(env, lpObject, GTypeQueryFc.type);
-	lpStruct->type_name = (const gchar *)(*env)->GetIntField(env, lpObject, GTypeQueryFc.type_name);
+	lpStruct->type_name = (const gchar *)(*env)->GetIntLongField(env, lpObject, GTypeQueryFc.type_name);
 	lpStruct->class_size = (guint)(*env)->GetIntField(env, lpObject, GTypeQueryFc.class_size);
 	lpStruct->instance_size = (guint)(*env)->GetIntField(env, lpObject, GTypeQueryFc.instance_size);
 	return lpStruct;
@@ -194,7 +194,7 @@ void setGTypeQueryFields(JNIEnv *env, jobject lpObject, GTypeQuery *lpStruct)
 {
 	if (!GTypeQueryFc.cached) cacheGTypeQueryFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, GTypeQueryFc.type, (jint)lpStruct->type);
-	(*env)->SetIntField(env, lpObject, GTypeQueryFc.type_name, (jint)lpStruct->type_name);
+	(*env)->SetIntLongField(env, lpObject, GTypeQueryFc.type_name, (jintLong)lpStruct->type_name);
 	(*env)->SetIntField(env, lpObject, GTypeQueryFc.class_size, (jint)lpStruct->class_size);
 	(*env)->SetIntField(env, lpObject, GTypeQueryFc.instance_size, (jint)lpStruct->instance_size);
 }
@@ -255,9 +255,9 @@ void cacheGdkDragContextFields(JNIEnv *env, jobject lpObject)
 	GdkDragContextFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	GdkDragContextFc.protocol = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "protocol", "I");
 	GdkDragContextFc.is_source = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "is_source", "Z");
-	GdkDragContextFc.source_window = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "source_window", "I");
-	GdkDragContextFc.dest_window = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "dest_window", "I");
-	GdkDragContextFc.targets = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "targets", "I");
+	GdkDragContextFc.source_window = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "source_window", I_J);
+	GdkDragContextFc.dest_window = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "dest_window", I_J);
+	GdkDragContextFc.targets = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "targets", I_J);
 	GdkDragContextFc.actions = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "actions", "I");
 	GdkDragContextFc.suggested_action = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "suggested_action", "I");
 	GdkDragContextFc.action = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "action", "I");
@@ -270,9 +270,9 @@ GdkDragContext *getGdkDragContextFields(JNIEnv *env, jobject lpObject, GdkDragCo
 	if (!GdkDragContextFc.cached) cacheGdkDragContextFields(env, lpObject);
 	lpStruct->protocol = (GdkDragProtocol)(*env)->GetIntField(env, lpObject, GdkDragContextFc.protocol);
 	lpStruct->is_source = (gboolean)(*env)->GetBooleanField(env, lpObject, GdkDragContextFc.is_source);
-	lpStruct->source_window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkDragContextFc.source_window);
-	lpStruct->dest_window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkDragContextFc.dest_window);
-	lpStruct->targets = (GList *)(*env)->GetIntField(env, lpObject, GdkDragContextFc.targets);
+	lpStruct->source_window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkDragContextFc.source_window);
+	lpStruct->dest_window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkDragContextFc.dest_window);
+	lpStruct->targets = (GList *)(*env)->GetIntLongField(env, lpObject, GdkDragContextFc.targets);
 	lpStruct->actions = (GdkDragAction)(*env)->GetIntField(env, lpObject, GdkDragContextFc.actions);
 	lpStruct->suggested_action = (GdkDragAction)(*env)->GetIntField(env, lpObject, GdkDragContextFc.suggested_action);
 	lpStruct->action = (GdkDragAction)(*env)->GetIntField(env, lpObject, GdkDragContextFc.action);
@@ -285,9 +285,9 @@ void setGdkDragContextFields(JNIEnv *env, jobject lpObject, GdkDragContext *lpSt
 	if (!GdkDragContextFc.cached) cacheGdkDragContextFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, GdkDragContextFc.protocol, (jint)lpStruct->protocol);
 	(*env)->SetBooleanField(env, lpObject, GdkDragContextFc.is_source, (jboolean)lpStruct->is_source);
-	(*env)->SetIntField(env, lpObject, GdkDragContextFc.source_window, (jint)lpStruct->source_window);
-	(*env)->SetIntField(env, lpObject, GdkDragContextFc.dest_window, (jint)lpStruct->dest_window);
-	(*env)->SetIntField(env, lpObject, GdkDragContextFc.targets, (jint)lpStruct->targets);
+	(*env)->SetIntLongField(env, lpObject, GdkDragContextFc.source_window, (jintLong)lpStruct->source_window);
+	(*env)->SetIntLongField(env, lpObject, GdkDragContextFc.dest_window, (jintLong)lpStruct->dest_window);
+	(*env)->SetIntLongField(env, lpObject, GdkDragContextFc.targets, (jintLong)lpStruct->targets);
 	(*env)->SetIntField(env, lpObject, GdkDragContextFc.actions, (jint)lpStruct->actions);
 	(*env)->SetIntField(env, lpObject, GdkDragContextFc.suggested_action, (jint)lpStruct->suggested_action);
 	(*env)->SetIntField(env, lpObject, GdkDragContextFc.action, (jint)lpStruct->action);
@@ -340,7 +340,7 @@ void cacheGdkEventAnyFields(JNIEnv *env, jobject lpObject)
 	if (GdkEventAnyFc.cached) return;
 	cacheGdkEventFields(env, lpObject);
 	GdkEventAnyFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GdkEventAnyFc.window = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "window", "I");
+	GdkEventAnyFc.window = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "window", I_J);
 	GdkEventAnyFc.send_event = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "send_event", "B");
 	GdkEventAnyFc.cached = 1;
 }
@@ -349,7 +349,7 @@ GdkEventAny *getGdkEventAnyFields(JNIEnv *env, jobject lpObject, GdkEventAny *lp
 {
 	if (!GdkEventAnyFc.cached) cacheGdkEventAnyFields(env, lpObject);
 	getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventAnyFc.window);
+	lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventAnyFc.window);
 	lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventAnyFc.send_event);
 	return lpStruct;
 }
@@ -358,7 +358,7 @@ void setGdkEventAnyFields(JNIEnv *env, jobject lpObject, GdkEventAny *lpStruct)
 {
 	if (!GdkEventAnyFc.cached) cacheGdkEventAnyFields(env, lpObject);
 	setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	(*env)->SetIntField(env, lpObject, GdkEventAnyFc.window, (jint)lpStruct->window);
+	(*env)->SetIntLongField(env, lpObject, GdkEventAnyFc.window, (jintLong)lpStruct->window);
 	(*env)->SetByteField(env, lpObject, GdkEventAnyFc.send_event, (jbyte)lpStruct->send_event);
 }
 #endif
@@ -377,15 +377,15 @@ void cacheGdkEventButtonFields(JNIEnv *env, jobject lpObject)
 	if (GdkEventButtonFc.cached) return;
 	cacheGdkEventFields(env, lpObject);
 	GdkEventButtonFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GdkEventButtonFc.window = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "window", "I");
+	GdkEventButtonFc.window = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "window", I_J);
 	GdkEventButtonFc.send_event = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "send_event", "B");
 	GdkEventButtonFc.time = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "time", "I");
 	GdkEventButtonFc.x = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "x", "D");
 	GdkEventButtonFc.y = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "y", "D");
-	GdkEventButtonFc.axes = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "axes", "I");
+	GdkEventButtonFc.axes = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "axes", I_J);
 	GdkEventButtonFc.state = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "state", "I");
 	GdkEventButtonFc.button = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "button", "I");
-	GdkEventButtonFc.device = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "device", "I");
+	GdkEventButtonFc.device = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "device", I_J);
 	GdkEventButtonFc.x_root = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "x_root", "D");
 	GdkEventButtonFc.y_root = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "y_root", "D");
 	GdkEventButtonFc.cached = 1;
@@ -395,15 +395,15 @@ GdkEventButton *getGdkEventButtonFields(JNIEnv *env, jobject lpObject, GdkEventB
 {
 	if (!GdkEventButtonFc.cached) cacheGdkEventButtonFields(env, lpObject);
 	getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.window);
+	lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventButtonFc.window);
 	lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventButtonFc.send_event);
 	lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.time);
 	lpStruct->x = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.x);
 	lpStruct->y = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.y);
-	lpStruct->axes = (gdouble *)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.axes);
+	lpStruct->axes = (gdouble *)(*env)->GetIntLongField(env, lpObject, GdkEventButtonFc.axes);
 	lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.state);
 	lpStruct->button = (guint)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.button);
-	lpStruct->device = (GdkDevice *)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.device);
+	lpStruct->device = (GdkDevice *)(*env)->GetIntLongField(env, lpObject, GdkEventButtonFc.device);
 	lpStruct->x_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.x_root);
 	lpStruct->y_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.y_root);
 	return lpStruct;
@@ -413,15 +413,15 @@ void setGdkEventButtonFields(JNIEnv *env, jobject lpObject, GdkEventButton *lpSt
 {
 	if (!GdkEventButtonFc.cached) cacheGdkEventButtonFields(env, lpObject);
 	setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	(*env)->SetIntField(env, lpObject, GdkEventButtonFc.window, (jint)lpStruct->window);
+	(*env)->SetIntLongField(env, lpObject, GdkEventButtonFc.window, (jintLong)lpStruct->window);
 	(*env)->SetByteField(env, lpObject, GdkEventButtonFc.send_event, (jbyte)lpStruct->send_event);
 	(*env)->SetIntField(env, lpObject, GdkEventButtonFc.time, (jint)lpStruct->time);
 	(*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.x, (jdouble)lpStruct->x);
 	(*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.y, (jdouble)lpStruct->y);
-	(*env)->SetIntField(env, lpObject, GdkEventButtonFc.axes, (jint)lpStruct->axes);
+	(*env)->SetIntLongField(env, lpObject, GdkEventButtonFc.axes, (jintLong)lpStruct->axes);
 	(*env)->SetIntField(env, lpObject, GdkEventButtonFc.state, (jint)lpStruct->state);
 	(*env)->SetIntField(env, lpObject, GdkEventButtonFc.button, (jint)lpStruct->button);
-	(*env)->SetIntField(env, lpObject, GdkEventButtonFc.device, (jint)lpStruct->device);
+	(*env)->SetIntLongField(env, lpObject, GdkEventButtonFc.device, (jintLong)lpStruct->device);
 	(*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.x_root, (jdouble)lpStruct->x_root);
 	(*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.y_root, (jdouble)lpStruct->y_root);
 }
@@ -441,9 +441,9 @@ void cacheGdkEventCrossingFields(JNIEnv *env, jobject lpObject)
 	if (GdkEventCrossingFc.cached) return;
 	cacheGdkEventFields(env, lpObject);
 	GdkEventCrossingFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GdkEventCrossingFc.window = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "window", "I");
+	GdkEventCrossingFc.window = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "window", I_J);
 	GdkEventCrossingFc.send_event = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "send_event", "B");
-	GdkEventCrossingFc.subwindow = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "subwindow", "I");
+	GdkEventCrossingFc.subwindow = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "subwindow", I_J);
 	GdkEventCrossingFc.time = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "time", "I");
 	GdkEventCrossingFc.x = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "x", "D");
 	GdkEventCrossingFc.y = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "y", "D");
@@ -460,9 +460,9 @@ GdkEventCrossing *getGdkEventCrossingFields(JNIEnv *env, jobject lpObject, GdkEv
 {
 	if (!GdkEventCrossingFc.cached) cacheGdkEventCrossingFields(env, lpObject);
 	getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventCrossingFc.window);
+	lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventCrossingFc.window);
 	lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventCrossingFc.send_event);
-	lpStruct->subwindow = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventCrossingFc.subwindow);
+	lpStruct->subwindow = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventCrossingFc.subwindow);
 	lpStruct->time = (*env)->GetIntField(env, lpObject, GdkEventCrossingFc.time);
 	lpStruct->x = (*env)->GetDoubleField(env, lpObject, GdkEventCrossingFc.x);
 	lpStruct->y = (*env)->GetDoubleField(env, lpObject, GdkEventCrossingFc.y);
@@ -479,9 +479,9 @@ void setGdkEventCrossingFields(JNIEnv *env, jobject lpObject, GdkEventCrossing *
 {
 	if (!GdkEventCrossingFc.cached) cacheGdkEventCrossingFields(env, lpObject);
 	setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	(*env)->SetIntField(env, lpObject, GdkEventCrossingFc.window, (jint)lpStruct->window);
+	(*env)->SetIntLongField(env, lpObject, GdkEventCrossingFc.window, (jintLong)lpStruct->window);
 	(*env)->SetByteField(env, lpObject, GdkEventCrossingFc.send_event, (jbyte)lpStruct->send_event);
-	(*env)->SetIntField(env, lpObject, GdkEventCrossingFc.subwindow, (jint)lpStruct->subwindow);
+	(*env)->SetIntLongField(env, lpObject, GdkEventCrossingFc.subwindow, (jintLong)lpStruct->subwindow);
 	(*env)->SetIntField(env, lpObject, GdkEventCrossingFc.time, (jint)lpStruct->time);
 	(*env)->SetDoubleField(env, lpObject, GdkEventCrossingFc.x, (jdouble)lpStruct->x);
 	(*env)->SetDoubleField(env, lpObject, GdkEventCrossingFc.y, (jdouble)lpStruct->y);
@@ -508,13 +508,13 @@ void cacheGdkEventExposeFields(JNIEnv *env, jobject lpObject)
 	if (GdkEventExposeFc.cached) return;
 	cacheGdkEventFields(env, lpObject);
 	GdkEventExposeFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GdkEventExposeFc.window = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "window", "I");
+	GdkEventExposeFc.window = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "window", I_J);
 	GdkEventExposeFc.send_event = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "send_event", "B");
 	GdkEventExposeFc.area_x = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_x", "I");
 	GdkEventExposeFc.area_y = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_y", "I");
 	GdkEventExposeFc.area_width = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_width", "I");
 	GdkEventExposeFc.area_height = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_height", "I");
-	GdkEventExposeFc.region = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "region", "I");
+	GdkEventExposeFc.region = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "region", I_J);
 	GdkEventExposeFc.count = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "count", "I");
 	GdkEventExposeFc.cached = 1;
 }
@@ -523,13 +523,13 @@ GdkEventExpose *getGdkEventExposeFields(JNIEnv *env, jobject lpObject, GdkEventE
 {
 	if (!GdkEventExposeFc.cached) cacheGdkEventExposeFields(env, lpObject);
 	getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventExposeFc.window);
+	lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventExposeFc.window);
 	lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventExposeFc.send_event);
 	lpStruct->area.x = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_x);
 	lpStruct->area.y = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_y);
 	lpStruct->area.width = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_width);
 	lpStruct->area.height = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_height);
-	lpStruct->region = (GdkRegion *)(*env)->GetIntField(env, lpObject, GdkEventExposeFc.region);
+	lpStruct->region = (GdkRegion *)(*env)->GetIntLongField(env, lpObject, GdkEventExposeFc.region);
 	lpStruct->count = (gint)(*env)->GetIntField(env, lpObject, GdkEventExposeFc.count);
 	return lpStruct;
 }
@@ -538,13 +538,13 @@ void setGdkEventExposeFields(JNIEnv *env, jobject lpObject, GdkEventExpose *lpSt
 {
 	if (!GdkEventExposeFc.cached) cacheGdkEventExposeFields(env, lpObject);
 	setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	(*env)->SetIntField(env, lpObject, GdkEventExposeFc.window, (jint)lpStruct->window);
+	(*env)->SetIntLongField(env, lpObject, GdkEventExposeFc.window, (jintLong)lpStruct->window);
 	(*env)->SetByteField(env, lpObject, GdkEventExposeFc.send_event, (jbyte)lpStruct->send_event);
 	(*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_x, (jint)lpStruct->area.x);
 	(*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_y, (jint)lpStruct->area.y);
 	(*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_width, (jint)lpStruct->area.width);
 	(*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_height, (jint)lpStruct->area.height);
-	(*env)->SetIntField(env, lpObject, GdkEventExposeFc.region, (jint)lpStruct->region);
+	(*env)->SetIntLongField(env, lpObject, GdkEventExposeFc.region, (jintLong)lpStruct->region);
 	(*env)->SetIntField(env, lpObject, GdkEventExposeFc.count, (jint)lpStruct->count);
 }
 #endif
@@ -563,7 +563,7 @@ void cacheGdkEventFocusFields(JNIEnv *env, jobject lpObject)
 	if (GdkEventFocusFc.cached) return;
 	cacheGdkEventFields(env, lpObject);
 	GdkEventFocusFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GdkEventFocusFc.window = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "window", "I");
+	GdkEventFocusFc.window = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "window", I_J);
 	GdkEventFocusFc.send_event = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "send_event", "B");
 	GdkEventFocusFc.in = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "in", "S");
 	GdkEventFocusFc.cached = 1;
@@ -573,7 +573,7 @@ GdkEventFocus *getGdkEventFocusFields(JNIEnv *env, jobject lpObject, GdkEventFoc
 {
 	if (!GdkEventFocusFc.cached) cacheGdkEventFocusFields(env, lpObject);
 	getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventFocusFc.window);
+	lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventFocusFc.window);
 	lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventFocusFc.send_event);
 	lpStruct->in = (gint16)(*env)->GetShortField(env, lpObject, GdkEventFocusFc.in);
 	return lpStruct;
@@ -583,7 +583,7 @@ void setGdkEventFocusFields(JNIEnv *env, jobject lpObject, GdkEventFocus *lpStru
 {
 	if (!GdkEventFocusFc.cached) cacheGdkEventFocusFields(env, lpObject);
 	setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	(*env)->SetIntField(env, lpObject, GdkEventFocusFc.window, (jint)lpStruct->window);
+	(*env)->SetIntLongField(env, lpObject, GdkEventFocusFc.window, (jintLong)lpStruct->window);
 	(*env)->SetByteField(env, lpObject, GdkEventFocusFc.send_event, (jbyte)lpStruct->send_event);
 	(*env)->SetShortField(env, lpObject, GdkEventFocusFc.in, (jshort)lpStruct->in);
 }
@@ -603,13 +603,13 @@ void cacheGdkEventKeyFields(JNIEnv *env, jobject lpObject)
 	if (GdkEventKeyFc.cached) return;
 	cacheGdkEventFields(env, lpObject);
 	GdkEventKeyFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GdkEventKeyFc.window = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "window", "I");
+	GdkEventKeyFc.window = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "window", I_J);
 	GdkEventKeyFc.send_event = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "send_event", "B");
 	GdkEventKeyFc.time = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "time", "I");
 	GdkEventKeyFc.state = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "state", "I");
 	GdkEventKeyFc.keyval = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "keyval", "I");
 	GdkEventKeyFc.length = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "length", "I");
-	GdkEventKeyFc.string = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "string", "I");
+	GdkEventKeyFc.string = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "string", I_J);
 	GdkEventKeyFc.hardware_keycode = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "hardware_keycode", "S");
 	GdkEventKeyFc.group = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "group", "B");
 	GdkEventKeyFc.cached = 1;
@@ -619,13 +619,13 @@ GdkEventKey *getGdkEventKeyFields(JNIEnv *env, jobject lpObject, GdkEventKey *lp
 {
 	if (!GdkEventKeyFc.cached) cacheGdkEventKeyFields(env, lpObject);
 	getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.window);
+	lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventKeyFc.window);
 	lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventKeyFc.send_event);
 	lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.time);
 	lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.state);
 	lpStruct->keyval = (guint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.keyval);
 	lpStruct->length = (gint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.length);
-	lpStruct->string = (gchar *)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.string);
+	lpStruct->string = (gchar *)(*env)->GetIntLongField(env, lpObject, GdkEventKeyFc.string);
 	lpStruct->hardware_keycode = (guint16)(*env)->GetShortField(env, lpObject, GdkEventKeyFc.hardware_keycode);
 	lpStruct->group = (guint8)(*env)->GetByteField(env, lpObject, GdkEventKeyFc.group);
 	return lpStruct;
@@ -635,13 +635,13 @@ void setGdkEventKeyFields(JNIEnv *env, jobject lpObject, GdkEventKey *lpStruct)
 {
 	if (!GdkEventKeyFc.cached) cacheGdkEventKeyFields(env, lpObject);
 	setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	(*env)->SetIntField(env, lpObject, GdkEventKeyFc.window, (jint)lpStruct->window);
+	(*env)->SetIntLongField(env, lpObject, GdkEventKeyFc.window, (jintLong)lpStruct->window);
 	(*env)->SetByteField(env, lpObject, GdkEventKeyFc.send_event, (jbyte)lpStruct->send_event);
 	(*env)->SetIntField(env, lpObject, GdkEventKeyFc.time, (jint)lpStruct->time);
 	(*env)->SetIntField(env, lpObject, GdkEventKeyFc.state, (jint)lpStruct->state);
 	(*env)->SetIntField(env, lpObject, GdkEventKeyFc.keyval, (jint)lpStruct->keyval);
 	(*env)->SetIntField(env, lpObject, GdkEventKeyFc.length, (jint)lpStruct->length);
-	(*env)->SetIntField(env, lpObject, GdkEventKeyFc.string, (jint)lpStruct->string);
+	(*env)->SetIntLongField(env, lpObject, GdkEventKeyFc.string, (jintLong)lpStruct->string);
 	(*env)->SetShortField(env, lpObject, GdkEventKeyFc.hardware_keycode, (jshort)lpStruct->hardware_keycode);
 	(*env)->SetByteField(env, lpObject, GdkEventKeyFc.group, (jbyte)lpStruct->group);
 }
@@ -661,15 +661,15 @@ void cacheGdkEventMotionFields(JNIEnv *env, jobject lpObject)
 	if (GdkEventMotionFc.cached) return;
 	cacheGdkEventFields(env, lpObject);
 	GdkEventMotionFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GdkEventMotionFc.window = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "window", "I");
+	GdkEventMotionFc.window = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "window", I_J);
 	GdkEventMotionFc.send_event = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "send_event", "B");
 	GdkEventMotionFc.time = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "time", "I");
 	GdkEventMotionFc.x = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "x", "D");
 	GdkEventMotionFc.y = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "y", "D");
-	GdkEventMotionFc.axes = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "axes", "I");
+	GdkEventMotionFc.axes = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "axes", I_J);
 	GdkEventMotionFc.state = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "state", "I");
 	GdkEventMotionFc.is_hint = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "is_hint", "S");
-	GdkEventMotionFc.device = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "device", "I");
+	GdkEventMotionFc.device = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "device", I_J);
 	GdkEventMotionFc.x_root = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "x_root", "D");
 	GdkEventMotionFc.y_root = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "y_root", "D");
 	GdkEventMotionFc.cached = 1;
@@ -679,15 +679,15 @@ GdkEventMotion *getGdkEventMotionFields(JNIEnv *env, jobject lpObject, GdkEventM
 {
 	if (!GdkEventMotionFc.cached) cacheGdkEventMotionFields(env, lpObject);
 	getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.window);
+	lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventMotionFc.window);
 	lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventMotionFc.send_event);
 	lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.time);
 	lpStruct->x = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.x);
 	lpStruct->y = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.y);
-	lpStruct->axes = (gdouble *)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.axes);
+	lpStruct->axes = (gdouble *)(*env)->GetIntLongField(env, lpObject, GdkEventMotionFc.axes);
 	lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.state);
 	lpStruct->is_hint = (gint16)(*env)->GetShortField(env, lpObject, GdkEventMotionFc.is_hint);
-	lpStruct->device = (GdkDevice *)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.device);
+	lpStruct->device = (GdkDevice *)(*env)->GetIntLongField(env, lpObject, GdkEventMotionFc.device);
 	lpStruct->x_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.x_root);
 	lpStruct->y_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.y_root);
 	return lpStruct;
@@ -697,15 +697,15 @@ void setGdkEventMotionFields(JNIEnv *env, jobject lpObject, GdkEventMotion *lpSt
 {
 	if (!GdkEventMotionFc.cached) cacheGdkEventMotionFields(env, lpObject);
 	setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	(*env)->SetIntField(env, lpObject, GdkEventMotionFc.window, (jint)lpStruct->window);
+	(*env)->SetIntLongField(env, lpObject, GdkEventMotionFc.window, (jintLong)lpStruct->window);
 	(*env)->SetByteField(env, lpObject, GdkEventMotionFc.send_event, (jbyte)lpStruct->send_event);
 	(*env)->SetIntField(env, lpObject, GdkEventMotionFc.time, (jint)lpStruct->time);
 	(*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.x, (jdouble)lpStruct->x);
 	(*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.y, (jdouble)lpStruct->y);
-	(*env)->SetIntField(env, lpObject, GdkEventMotionFc.axes, (jint)lpStruct->axes);
+	(*env)->SetIntLongField(env, lpObject, GdkEventMotionFc.axes, (jintLong)lpStruct->axes);
 	(*env)->SetIntField(env, lpObject, GdkEventMotionFc.state, (jint)lpStruct->state);
 	(*env)->SetShortField(env, lpObject, GdkEventMotionFc.is_hint, (jshort)lpStruct->is_hint);
-	(*env)->SetIntField(env, lpObject, GdkEventMotionFc.device, (jint)lpStruct->device);
+	(*env)->SetIntLongField(env, lpObject, GdkEventMotionFc.device, (jintLong)lpStruct->device);
 	(*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.x_root, (jdouble)lpStruct->x_root);
 	(*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.y_root, (jdouble)lpStruct->y_root);
 }
@@ -725,14 +725,14 @@ void cacheGdkEventScrollFields(JNIEnv *env, jobject lpObject)
 	if (GdkEventScrollFc.cached) return;
 	cacheGdkEventFields(env, lpObject);
 	GdkEventScrollFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GdkEventScrollFc.window = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "window", "I");
+	GdkEventScrollFc.window = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "window", I_J);
 	GdkEventScrollFc.send_event = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "send_event", "B");
 	GdkEventScrollFc.time = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "time", "I");
 	GdkEventScrollFc.x = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "x", "D");
 	GdkEventScrollFc.y = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "y", "D");
 	GdkEventScrollFc.state = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "state", "I");
 	GdkEventScrollFc.direction = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "direction", "I");
-	GdkEventScrollFc.device = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "device", "I");
+	GdkEventScrollFc.device = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "device", I_J);
 	GdkEventScrollFc.x_root = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "x_root", "D");
 	GdkEventScrollFc.y_root = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "y_root", "D");
 	GdkEventScrollFc.cached = 1;
@@ -742,14 +742,14 @@ GdkEventScroll *getGdkEventScrollFields(JNIEnv *env, jobject lpObject, GdkEventS
 {
 	if (!GdkEventScrollFc.cached) cacheGdkEventScrollFields(env, lpObject);
 	getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.window);
+	lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventScrollFc.window);
 	lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventScrollFc.send_event);
 	lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.time);
 	lpStruct->x = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventScrollFc.x);
 	lpStruct->y = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventScrollFc.y);
 	lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.state);
 	lpStruct->direction = (GdkScrollDirection)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.direction);
-	lpStruct->device = (GdkDevice *)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.device);
+	lpStruct->device = (GdkDevice *)(*env)->GetIntLongField(env, lpObject, GdkEventScrollFc.device);
 	lpStruct->x_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventScrollFc.x_root);
 	lpStruct->y_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventScrollFc.y_root);
 	return lpStruct;
@@ -759,14 +759,14 @@ void setGdkEventScrollFields(JNIEnv *env, jobject lpObject, GdkEventScroll *lpSt
 {
 	if (!GdkEventScrollFc.cached) cacheGdkEventScrollFields(env, lpObject);
 	setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	(*env)->SetIntField(env, lpObject, GdkEventScrollFc.window, (jint)lpStruct->window);
+	(*env)->SetIntLongField(env, lpObject, GdkEventScrollFc.window, (jintLong)lpStruct->window);
 	(*env)->SetByteField(env, lpObject, GdkEventScrollFc.send_event, (jbyte)lpStruct->send_event);
 	(*env)->SetIntField(env, lpObject, GdkEventScrollFc.time, (jint)lpStruct->time);
 	(*env)->SetDoubleField(env, lpObject, GdkEventScrollFc.x, (jdouble)lpStruct->x);
 	(*env)->SetDoubleField(env, lpObject, GdkEventScrollFc.y, (jdouble)lpStruct->y);
 	(*env)->SetIntField(env, lpObject, GdkEventScrollFc.state, (jint)lpStruct->state);
 	(*env)->SetIntField(env, lpObject, GdkEventScrollFc.direction, (jint)lpStruct->direction);
-	(*env)->SetIntField(env, lpObject, GdkEventScrollFc.device, (jint)lpStruct->device);
+	(*env)->SetIntLongField(env, lpObject, GdkEventScrollFc.device, (jintLong)lpStruct->device);
 	(*env)->SetDoubleField(env, lpObject, GdkEventScrollFc.x_root, (jdouble)lpStruct->x_root);
 	(*env)->SetDoubleField(env, lpObject, GdkEventScrollFc.y_root, (jdouble)lpStruct->y_root);
 }
@@ -786,7 +786,7 @@ void cacheGdkEventVisibilityFields(JNIEnv *env, jobject lpObject)
 	if (GdkEventVisibilityFc.cached) return;
 	cacheGdkEventFields(env, lpObject);
 	GdkEventVisibilityFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GdkEventVisibilityFc.window = (*env)->GetFieldID(env, GdkEventVisibilityFc.clazz, "window", "I");
+	GdkEventVisibilityFc.window = (*env)->GetFieldID(env, GdkEventVisibilityFc.clazz, "window", I_J);
 	GdkEventVisibilityFc.send_event = (*env)->GetFieldID(env, GdkEventVisibilityFc.clazz, "send_event", "B");
 	GdkEventVisibilityFc.state = (*env)->GetFieldID(env, GdkEventVisibilityFc.clazz, "state", "I");
 	GdkEventVisibilityFc.cached = 1;
@@ -796,7 +796,7 @@ GdkEventVisibility *getGdkEventVisibilityFields(JNIEnv *env, jobject lpObject, G
 {
 	if (!GdkEventVisibilityFc.cached) cacheGdkEventVisibilityFields(env, lpObject);
 	getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventVisibilityFc.window);
+	lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventVisibilityFc.window);
 	lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventVisibilityFc.send_event);
 	lpStruct->state = (GdkVisibilityState)(*env)->GetIntField(env, lpObject, GdkEventVisibilityFc.state);
 	return lpStruct;
@@ -806,7 +806,7 @@ void setGdkEventVisibilityFields(JNIEnv *env, jobject lpObject, GdkEventVisibili
 {
 	if (!GdkEventVisibilityFc.cached) cacheGdkEventVisibilityFields(env, lpObject);
 	setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	(*env)->SetIntField(env, lpObject, GdkEventVisibilityFc.window, (jint)lpStruct->window);
+	(*env)->SetIntLongField(env, lpObject, GdkEventVisibilityFc.window, (jintLong)lpStruct->window);
 	(*env)->SetByteField(env, lpObject, GdkEventVisibilityFc.send_event, (jbyte)lpStruct->send_event);
 	(*env)->SetIntField(env, lpObject, GdkEventVisibilityFc.state, (jint)lpStruct->state);
 }
@@ -826,7 +826,7 @@ void cacheGdkEventWindowStateFields(JNIEnv *env, jobject lpObject)
 	if (GdkEventWindowStateFc.cached) return;
 	cacheGdkEventFields(env, lpObject);
 	GdkEventWindowStateFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GdkEventWindowStateFc.window = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "window", "I");
+	GdkEventWindowStateFc.window = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "window", I_J);
 	GdkEventWindowStateFc.send_event = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "send_event", "B");
 	GdkEventWindowStateFc.changed_mask = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "changed_mask", "I");
 	GdkEventWindowStateFc.new_window_state = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "new_window_state", "I");
@@ -837,7 +837,7 @@ GdkEventWindowState *getGdkEventWindowStateFields(JNIEnv *env, jobject lpObject,
 {
 	if (!GdkEventWindowStateFc.cached) cacheGdkEventWindowStateFields(env, lpObject);
 	getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventWindowStateFc.window);
+	lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventWindowStateFc.window);
 	lpStruct->send_event = (*env)->GetByteField(env, lpObject, GdkEventWindowStateFc.send_event);
 	lpStruct->changed_mask = (*env)->GetIntField(env, lpObject, GdkEventWindowStateFc.changed_mask);
 	lpStruct->new_window_state = (*env)->GetIntField(env, lpObject, GdkEventWindowStateFc.new_window_state);
@@ -848,7 +848,7 @@ void setGdkEventWindowStateFields(JNIEnv *env, jobject lpObject, GdkEventWindowS
 {
 	if (!GdkEventWindowStateFc.cached) cacheGdkEventWindowStateFields(env, lpObject);
 	setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	(*env)->SetIntField(env, lpObject, GdkEventWindowStateFc.window, (jint)lpStruct->window);
+	(*env)->SetIntLongField(env, lpObject, GdkEventWindowStateFc.window, (jintLong)lpStruct->window);
 	(*env)->SetByteField(env, lpObject, GdkEventWindowStateFc.send_event, (jbyte)lpStruct->send_event);
 	(*env)->SetIntField(env, lpObject, GdkEventWindowStateFc.changed_mask, (jint)lpStruct->changed_mask);
 	(*env)->SetIntField(env, lpObject, GdkEventWindowStateFc.new_window_state, (jint)lpStruct->new_window_state);
@@ -876,12 +876,12 @@ void cacheGdkGCValuesFields(JNIEnv *env, jobject lpObject)
 	GdkGCValuesFc.background_red = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "background_red", "S");
 	GdkGCValuesFc.background_green = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "background_green", "S");
 	GdkGCValuesFc.background_blue = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "background_blue", "S");
-	GdkGCValuesFc.font = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "font", "I");
-	GdkGCValuesFc.function = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "function", "I");
+	GdkGCValuesFc.font = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "font", I_J);
+	GdkGCValuesFc.function = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "function", I_J);
 	GdkGCValuesFc.fill = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "fill", "I");
-	GdkGCValuesFc.tile = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "tile", "I");
-	GdkGCValuesFc.stipple = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "stipple", "I");
-	GdkGCValuesFc.clip_mask = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "clip_mask", "I");
+	GdkGCValuesFc.tile = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "tile", I_J);
+	GdkGCValuesFc.stipple = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "stipple", I_J);
+	GdkGCValuesFc.clip_mask = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "clip_mask", I_J);
 	GdkGCValuesFc.subwindow_mode = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "subwindow_mode", "I");
 	GdkGCValuesFc.ts_x_origin = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "ts_x_origin", "I");
 	GdkGCValuesFc.ts_y_origin = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "ts_y_origin", "I");
@@ -906,12 +906,12 @@ GdkGCValues *getGdkGCValuesFields(JNIEnv *env, jobject lpObject, GdkGCValues *lp
 	lpStruct->background.red = (guint16)(*env)->GetShortField(env, lpObject, GdkGCValuesFc.background_red);
 	lpStruct->background.green = (guint16)(*env)->GetShortField(env, lpObject, GdkGCValuesFc.background_green);
 	lpStruct->background.blue = (guint16)(*env)->GetShortField(env, lpObject, GdkGCValuesFc.background_blue);
-	lpStruct->font = (GdkFont *)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.font);
-	lpStruct->function = (GdkFunction)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.function);
+	lpStruct->font = (GdkFont *)(*env)->GetIntLongField(env, lpObject, GdkGCValuesFc.font);
+	lpStruct->function = (GdkFunction)(*env)->GetIntLongField(env, lpObject, GdkGCValuesFc.function);
 	lpStruct->fill = (GdkFill)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.fill);
-	lpStruct->tile = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.tile);
-	lpStruct->stipple = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.stipple);
-	lpStruct->clip_mask = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.clip_mask);
+	lpStruct->tile = (GdkPixmap *)(*env)->GetIntLongField(env, lpObject, GdkGCValuesFc.tile);
+	lpStruct->stipple = (GdkPixmap *)(*env)->GetIntLongField(env, lpObject, GdkGCValuesFc.stipple);
+	lpStruct->clip_mask = (GdkPixmap *)(*env)->GetIntLongField(env, lpObject, GdkGCValuesFc.clip_mask);
 	lpStruct->subwindow_mode = (GdkSubwindowMode)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.subwindow_mode);
 	lpStruct->ts_x_origin = (gint)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.ts_x_origin);
 	lpStruct->ts_y_origin = (gint)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.ts_y_origin);
@@ -936,12 +936,12 @@ void setGdkGCValuesFields(JNIEnv *env, jobject lpObject, GdkGCValues *lpStruct)
 	(*env)->SetShortField(env, lpObject, GdkGCValuesFc.background_red, (jshort)lpStruct->background.red);
 	(*env)->SetShortField(env, lpObject, GdkGCValuesFc.background_green, (jshort)lpStruct->background.green);
 	(*env)->SetShortField(env, lpObject, GdkGCValuesFc.background_blue, (jshort)lpStruct->background.blue);
-	(*env)->SetIntField(env, lpObject, GdkGCValuesFc.font, (jint)lpStruct->font);
-	(*env)->SetIntField(env, lpObject, GdkGCValuesFc.function, (jint)lpStruct->function);
+	(*env)->SetIntLongField(env, lpObject, GdkGCValuesFc.font, (jintLong)lpStruct->font);
+	(*env)->SetIntLongField(env, lpObject, GdkGCValuesFc.function, (jintLong)lpStruct->function);
 	(*env)->SetIntField(env, lpObject, GdkGCValuesFc.fill, (jint)lpStruct->fill);
-	(*env)->SetIntField(env, lpObject, GdkGCValuesFc.tile, (jint)lpStruct->tile);
-	(*env)->SetIntField(env, lpObject, GdkGCValuesFc.stipple, (jint)lpStruct->stipple);
-	(*env)->SetIntField(env, lpObject, GdkGCValuesFc.clip_mask, (jint)lpStruct->clip_mask);
+	(*env)->SetIntLongField(env, lpObject, GdkGCValuesFc.tile, (jintLong)lpStruct->tile);
+	(*env)->SetIntLongField(env, lpObject, GdkGCValuesFc.stipple, (jintLong)lpStruct->stipple);
+	(*env)->SetIntLongField(env, lpObject, GdkGCValuesFc.clip_mask, (jintLong)lpStruct->clip_mask);
 	(*env)->SetIntField(env, lpObject, GdkGCValuesFc.subwindow_mode, (jint)lpStruct->subwindow_mode);
 	(*env)->SetIntField(env, lpObject, GdkGCValuesFc.ts_x_origin, (jint)lpStruct->ts_x_origin);
 	(*env)->SetIntField(env, lpObject, GdkGCValuesFc.ts_y_origin, (jint)lpStruct->ts_y_origin);
@@ -1030,7 +1030,7 @@ void cacheGdkImageFields(JNIEnv *env, jobject lpObject)
 	if (GdkImageFc.cached) return;
 	GdkImageFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	GdkImageFc.type = (*env)->GetFieldID(env, GdkImageFc.clazz, "type", "I");
-	GdkImageFc.visual = (*env)->GetFieldID(env, GdkImageFc.clazz, "visual", "I");
+	GdkImageFc.visual = (*env)->GetFieldID(env, GdkImageFc.clazz, "visual", I_J);
 	GdkImageFc.byte_order = (*env)->GetFieldID(env, GdkImageFc.clazz, "byte_order", "I");
 	GdkImageFc.width = (*env)->GetFieldID(env, GdkImageFc.clazz, "width", "I");
 	GdkImageFc.height = (*env)->GetFieldID(env, GdkImageFc.clazz, "height", "I");
@@ -1038,9 +1038,9 @@ void cacheGdkImageFields(JNIEnv *env, jobject lpObject)
 	GdkImageFc.bpp = (*env)->GetFieldID(env, GdkImageFc.clazz, "bpp", "S");
 	GdkImageFc.bpl = (*env)->GetFieldID(env, GdkImageFc.clazz, "bpl", "S");
 	GdkImageFc.bits_per_pixel = (*env)->GetFieldID(env, GdkImageFc.clazz, "bits_per_pixel", "S");
-	GdkImageFc.mem = (*env)->GetFieldID(env, GdkImageFc.clazz, "mem", "I");
-	GdkImageFc.colormap = (*env)->GetFieldID(env, GdkImageFc.clazz, "colormap", "I");
-	GdkImageFc.windowing_data = (*env)->GetFieldID(env, GdkImageFc.clazz, "windowing_data", "I");
+	GdkImageFc.mem = (*env)->GetFieldID(env, GdkImageFc.clazz, "mem", I_J);
+	GdkImageFc.colormap = (*env)->GetFieldID(env, GdkImageFc.clazz, "colormap", I_J);
+	GdkImageFc.windowing_data = (*env)->GetFieldID(env, GdkImageFc.clazz, "windowing_data", I_J);
 	GdkImageFc.cached = 1;
 }
 
@@ -1048,7 +1048,7 @@ GdkImage *getGdkImageFields(JNIEnv *env, jobject lpObject, GdkImage *lpStruct)
 {
 	if (!GdkImageFc.cached) cacheGdkImageFields(env, lpObject);
 	lpStruct->type = (GdkImageType)(*env)->GetIntField(env, lpObject, GdkImageFc.type);
-	lpStruct->visual = (GdkVisual *)(*env)->GetIntField(env, lpObject, GdkImageFc.visual);
+	lpStruct->visual = (GdkVisual *)(*env)->GetIntLongField(env, lpObject, GdkImageFc.visual);
 	lpStruct->byte_order = (GdkByteOrder)(*env)->GetIntField(env, lpObject, GdkImageFc.byte_order);
 	lpStruct->width = (gint)(*env)->GetIntField(env, lpObject, GdkImageFc.width);
 	lpStruct->height = (gint)(*env)->GetIntField(env, lpObject, GdkImageFc.height);
@@ -1056,9 +1056,9 @@ GdkImage *getGdkImageFields(JNIEnv *env, jobject lpObject, GdkImage *lpStruct)
 	lpStruct->bpp = (guint16)(*env)->GetShortField(env, lpObject, GdkImageFc.bpp);
 	lpStruct->bpl = (guint16)(*env)->GetShortField(env, lpObject, GdkImageFc.bpl);
 	lpStruct->bits_per_pixel = (guint16)(*env)->GetShortField(env, lpObject, GdkImageFc.bits_per_pixel);
-	lpStruct->mem = (gpointer)(*env)->GetIntField(env, lpObject, GdkImageFc.mem);
-	lpStruct->colormap = (GdkColormap *)(*env)->GetIntField(env, lpObject, GdkImageFc.colormap);
-	lpStruct->windowing_data = (gpointer)(*env)->GetIntField(env, lpObject, GdkImageFc.windowing_data);
+	lpStruct->mem = (gpointer)(*env)->GetIntLongField(env, lpObject, GdkImageFc.mem);
+	lpStruct->colormap = (GdkColormap *)(*env)->GetIntLongField(env, lpObject, GdkImageFc.colormap);
+	lpStruct->windowing_data = (gpointer)(*env)->GetIntLongField(env, lpObject, GdkImageFc.windowing_data);
 	return lpStruct;
 }
 
@@ -1066,7 +1066,7 @@ void setGdkImageFields(JNIEnv *env, jobject lpObject, GdkImage *lpStruct)
 {
 	if (!GdkImageFc.cached) cacheGdkImageFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, GdkImageFc.type, (jint)lpStruct->type);
-	(*env)->SetIntField(env, lpObject, GdkImageFc.visual, (jint)lpStruct->visual);
+	(*env)->SetIntLongField(env, lpObject, GdkImageFc.visual, (jintLong)lpStruct->visual);
 	(*env)->SetIntField(env, lpObject, GdkImageFc.byte_order, (jint)lpStruct->byte_order);
 	(*env)->SetIntField(env, lpObject, GdkImageFc.width, (jint)lpStruct->width);
 	(*env)->SetIntField(env, lpObject, GdkImageFc.height, (jint)lpStruct->height);
@@ -1074,9 +1074,9 @@ void setGdkImageFields(JNIEnv *env, jobject lpObject, GdkImage *lpStruct)
 	(*env)->SetShortField(env, lpObject, GdkImageFc.bpp, (jshort)lpStruct->bpp);
 	(*env)->SetShortField(env, lpObject, GdkImageFc.bpl, (jshort)lpStruct->bpl);
 	(*env)->SetShortField(env, lpObject, GdkImageFc.bits_per_pixel, (jshort)lpStruct->bits_per_pixel);
-	(*env)->SetIntField(env, lpObject, GdkImageFc.mem, (jint)lpStruct->mem);
-	(*env)->SetIntField(env, lpObject, GdkImageFc.colormap, (jint)lpStruct->colormap);
-	(*env)->SetIntField(env, lpObject, GdkImageFc.windowing_data, (jint)lpStruct->windowing_data);
+	(*env)->SetIntLongField(env, lpObject, GdkImageFc.mem, (jintLong)lpStruct->mem);
+	(*env)->SetIntLongField(env, lpObject, GdkImageFc.colormap, (jintLong)lpStruct->colormap);
+	(*env)->SetIntLongField(env, lpObject, GdkImageFc.windowing_data, (jintLong)lpStruct->windowing_data);
 }
 #endif
 
@@ -1203,19 +1203,19 @@ void cacheGdkWindowAttrFields(JNIEnv *env, jobject lpObject)
 {
 	if (GdkWindowAttrFc.cached) return;
 	GdkWindowAttrFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GdkWindowAttrFc.title = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "title", "I");
+	GdkWindowAttrFc.title = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "title", I_J);
 	GdkWindowAttrFc.event_mask = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "event_mask", "I");
 	GdkWindowAttrFc.x = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "x", "I");
 	GdkWindowAttrFc.y = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "y", "I");
 	GdkWindowAttrFc.width = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "width", "I");
 	GdkWindowAttrFc.height = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "height", "I");
 	GdkWindowAttrFc.wclass = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wclass", "I");
-	GdkWindowAttrFc.visual = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "visual", "I");
-	GdkWindowAttrFc.colormap = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "colormap", "I");
+	GdkWindowAttrFc.visual = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "visual", I_J);
+	GdkWindowAttrFc.colormap = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "colormap", I_J);
 	GdkWindowAttrFc.window_type = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "window_type", "I");
-	GdkWindowAttrFc.cursor = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "cursor", "I");
-	GdkWindowAttrFc.wmclass_name = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_name", "I");
-	GdkWindowAttrFc.wmclass_class = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_class", "I");
+	GdkWindowAttrFc.cursor = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "cursor", I_J);
+	GdkWindowAttrFc.wmclass_name = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_name", I_J);
+	GdkWindowAttrFc.wmclass_class = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_class", I_J);
 	GdkWindowAttrFc.override_redirect = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "override_redirect", "Z");
 	GdkWindowAttrFc.cached = 1;
 }
@@ -1223,19 +1223,19 @@ void cacheGdkWindowAttrFields(JNIEnv *env, jobject lpObject)
 GdkWindowAttr *getGdkWindowAttrFields(JNIEnv *env, jobject lpObject, GdkWindowAttr *lpStruct)
 {
 	if (!GdkWindowAttrFc.cached) cacheGdkWindowAttrFields(env, lpObject);
-	lpStruct->title = (gchar *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.title);
+	lpStruct->title = (gchar *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.title);
 	lpStruct->event_mask = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.event_mask);
 	lpStruct->x = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.x);
 	lpStruct->y = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.y);
 	lpStruct->width = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.width);
 	lpStruct->height = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.height);
 	lpStruct->wclass = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.wclass);
-	lpStruct->visual = (GdkVisual *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.visual);
-	lpStruct->colormap = (GdkColormap *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.colormap);
+	lpStruct->visual = (GdkVisual *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.visual);
+	lpStruct->colormap = (GdkColormap *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.colormap);
 	lpStruct->window_type = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.window_type);
-	lpStruct->cursor = (GdkCursor *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.cursor);
-	lpStruct->wmclass_name = (gchar *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.wmclass_name);
-	lpStruct->wmclass_class = (gchar *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.wmclass_class);
+	lpStruct->cursor = (GdkCursor *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.cursor);
+	lpStruct->wmclass_name = (gchar *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.wmclass_name);
+	lpStruct->wmclass_class = (gchar *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.wmclass_class);
 	lpStruct->override_redirect = (*env)->GetBooleanField(env, lpObject, GdkWindowAttrFc.override_redirect);
 	return lpStruct;
 }
@@ -1243,19 +1243,19 @@ GdkWindowAttr *getGdkWindowAttrFields(JNIEnv *env, jobject lpObject, GdkWindowAt
 void setGdkWindowAttrFields(JNIEnv *env, jobject lpObject, GdkWindowAttr *lpStruct)
 {
 	if (!GdkWindowAttrFc.cached) cacheGdkWindowAttrFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.title, (jint)lpStruct->title);
+	(*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.title, (jintLong)lpStruct->title);
 	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.event_mask, (jint)lpStruct->event_mask);
 	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.x, (jint)lpStruct->x);
 	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.y, (jint)lpStruct->y);
 	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.width, (jint)lpStruct->width);
 	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.height, (jint)lpStruct->height);
 	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.wclass, (jint)lpStruct->wclass);
-	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.visual, (jint)lpStruct->visual);
-	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.colormap, (jint)lpStruct->colormap);
+	(*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.visual, (jintLong)lpStruct->visual);
+	(*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.colormap, (jintLong)lpStruct->colormap);
 	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.window_type, (jint)lpStruct->window_type);
-	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.cursor, (jint)lpStruct->cursor);
-	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.wmclass_name, (jint)lpStruct->wmclass_name);
-	(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.wmclass_class, (jint)lpStruct->wmclass_class);
+	(*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.cursor, (jintLong)lpStruct->cursor);
+	(*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.wmclass_name, (jintLong)lpStruct->wmclass_name);
+	(*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.wmclass_class, (jintLong)lpStruct->wmclass_class);
 	(*env)->SetBooleanField(env, lpObject, GdkWindowAttrFc.override_redirect, (jboolean)lpStruct->override_redirect);
 }
 #endif
@@ -1399,24 +1399,24 @@ void cacheGtkCellRendererClassFields(JNIEnv *env, jobject lpObject)
 {
 	if (GtkCellRendererClassFc.cached) return;
 	GtkCellRendererClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GtkCellRendererClassFc.render = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "render", "I");
-	GtkCellRendererClassFc.get_size = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "get_size", "I");
+	GtkCellRendererClassFc.render = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "render", I_J);
+	GtkCellRendererClassFc.get_size = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "get_size", I_J);
 	GtkCellRendererClassFc.cached = 1;
 }
 
 GtkCellRendererClass *getGtkCellRendererClassFields(JNIEnv *env, jobject lpObject, GtkCellRendererClass *lpStruct)
 {
 	if (!GtkCellRendererClassFc.cached) cacheGtkCellRendererClassFields(env, lpObject);
-	lpStruct->render = (void(*)())(*env)->GetIntField(env, lpObject, GtkCellRendererClassFc.render);
-	lpStruct->get_size = (void(*)())(*env)->GetIntField(env, lpObject, GtkCellRendererClassFc.get_size);
+	lpStruct->render = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.render);
+	lpStruct->get_size = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.get_size);
 	return lpStruct;
 }
 
 void setGtkCellRendererClassFields(JNIEnv *env, jobject lpObject, GtkCellRendererClass *lpStruct)
 {
 	if (!GtkCellRendererClassFc.cached) cacheGtkCellRendererClassFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GtkCellRendererClassFc.render, (jint)lpStruct->render);
-	(*env)->SetIntField(env, lpObject, GtkCellRendererClassFc.get_size, (jint)lpStruct->get_size);
+	(*env)->SetIntLongField(env, lpObject, GtkCellRendererClassFc.render, (jintLong)lpStruct->render);
+	(*env)->SetIntLongField(env, lpObject, GtkCellRendererClassFc.get_size, (jintLong)lpStruct->get_size);
 }
 #endif
 
@@ -1433,30 +1433,30 @@ void cacheGtkColorSelectionDialogFields(JNIEnv *env, jobject lpObject)
 {
 	if (GtkColorSelectionDialogFc.cached) return;
 	GtkColorSelectionDialogFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GtkColorSelectionDialogFc.colorsel = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "colorsel", "I");
-	GtkColorSelectionDialogFc.ok_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "ok_button", "I");
-	GtkColorSelectionDialogFc.cancel_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "cancel_button", "I");
-	GtkColorSelectionDialogFc.help_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "help_button", "I");
+	GtkColorSelectionDialogFc.colorsel = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "colorsel", I_J);
+	GtkColorSelectionDialogFc.ok_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "ok_button", I_J);
+	GtkColorSelectionDialogFc.cancel_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "cancel_button", I_J);
+	GtkColorSelectionDialogFc.help_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "help_button", I_J);
 	GtkColorSelectionDialogFc.cached = 1;
 }
 
 GtkColorSelectionDialog *getGtkColorSelectionDialogFields(JNIEnv *env, jobject lpObject, GtkColorSelectionDialog *lpStruct)
 {
 	if (!GtkColorSelectionDialogFc.cached) cacheGtkColorSelectionDialogFields(env, lpObject);
-	lpStruct->colorsel = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkColorSelectionDialogFc.colorsel);
-	lpStruct->ok_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkColorSelectionDialogFc.ok_button);
-	lpStruct->cancel_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkColorSelectionDialogFc.cancel_button);
-	lpStruct->help_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkColorSelectionDialogFc.help_button);
+	lpStruct->colorsel = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkColorSelectionDialogFc.colorsel);
+	lpStruct->ok_button = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkColorSelectionDialogFc.ok_button);
+	lpStruct->cancel_button = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkColorSelectionDialogFc.cancel_button);
+	lpStruct->help_button = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkColorSelectionDialogFc.help_button);
 	return lpStruct;
 }
 
 void setGtkColorSelectionDialogFields(JNIEnv *env, jobject lpObject, GtkColorSelectionDialog *lpStruct)
 {
 	if (!GtkColorSelectionDialogFc.cached) cacheGtkColorSelectionDialogFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GtkColorSelectionDialogFc.colorsel, (jint)lpStruct->colorsel);
-	(*env)->SetIntField(env, lpObject, GtkColorSelectionDialogFc.ok_button, (jint)lpStruct->ok_button);
-	(*env)->SetIntField(env, lpObject, GtkColorSelectionDialogFc.cancel_button, (jint)lpStruct->cancel_button);
-	(*env)->SetIntField(env, lpObject, GtkColorSelectionDialogFc.help_button, (jint)lpStruct->help_button);
+	(*env)->SetIntLongField(env, lpObject, GtkColorSelectionDialogFc.colorsel, (jintLong)lpStruct->colorsel);
+	(*env)->SetIntLongField(env, lpObject, GtkColorSelectionDialogFc.ok_button, (jintLong)lpStruct->ok_button);
+	(*env)->SetIntLongField(env, lpObject, GtkColorSelectionDialogFc.cancel_button, (jintLong)lpStruct->cancel_button);
+	(*env)->SetIntLongField(env, lpObject, GtkColorSelectionDialogFc.help_button, (jintLong)lpStruct->help_button);
 }
 #endif
 
@@ -1473,24 +1473,24 @@ void cacheGtkComboFields(JNIEnv *env, jobject lpObject)
 {
 	if (GtkComboFc.cached) return;
 	GtkComboFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GtkComboFc.entry = (*env)->GetFieldID(env, GtkComboFc.clazz, "entry", "I");
-	GtkComboFc.list = (*env)->GetFieldID(env, GtkComboFc.clazz, "list", "I");
+	GtkComboFc.entry = (*env)->GetFieldID(env, GtkComboFc.clazz, "entry", I_J);
+	GtkComboFc.list = (*env)->GetFieldID(env, GtkComboFc.clazz, "list", I_J);
 	GtkComboFc.cached = 1;
 }
 
 GtkCombo *getGtkComboFields(JNIEnv *env, jobject lpObject, GtkCombo *lpStruct)
 {
 	if (!GtkComboFc.cached) cacheGtkComboFields(env, lpObject);
-	lpStruct->entry = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkComboFc.entry);
-	lpStruct->list = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkComboFc.list);
+	lpStruct->entry = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkComboFc.entry);
+	lpStruct->list = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkComboFc.list);
 	return lpStruct;
 }
 
 void setGtkComboFields(JNIEnv *env, jobject lpObject, GtkCombo *lpStruct)
 {
 	if (!GtkComboFc.cached) cacheGtkComboFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GtkComboFc.entry, (jint)lpStruct->entry);
-	(*env)->SetIntField(env, lpObject, GtkComboFc.list, (jint)lpStruct->list);
+	(*env)->SetIntLongField(env, lpObject, GtkComboFc.entry, (jintLong)lpStruct->entry);
+	(*env)->SetIntLongField(env, lpObject, GtkComboFc.list, (jintLong)lpStruct->list);
 }
 #endif
 
@@ -1507,78 +1507,78 @@ void cacheGtkFileSelectionFields(JNIEnv *env, jobject lpObject)
 {
 	if (GtkFileSelectionFc.cached) return;
 	GtkFileSelectionFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GtkFileSelectionFc.dir_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "dir_list", "I");
-	GtkFileSelectionFc.file_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "file_list", "I");
-	GtkFileSelectionFc.selection_entry = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "selection_entry", "I");
-	GtkFileSelectionFc.selection_text = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "selection_text", "I");
-	GtkFileSelectionFc.main_vbox = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "main_vbox", "I");
-	GtkFileSelectionFc.ok_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "ok_button", "I");
-	GtkFileSelectionFc.cancel_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "cancel_button", "I");
-	GtkFileSelectionFc.help_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "help_button", "I");
-	GtkFileSelectionFc.history_pulldown = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_pulldown", "I");
-	GtkFileSelectionFc.history_menu = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_menu", "I");
-	GtkFileSelectionFc.history_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_list", "I");
-	GtkFileSelectionFc.fileop_dialog = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_dialog", "I");
-	GtkFileSelectionFc.fileop_entry = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_entry", "I");
-	GtkFileSelectionFc.fileop_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_file", "I");
-	GtkFileSelectionFc.cmpl_state = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "cmpl_state", "I");
-	GtkFileSelectionFc.fileop_c_dir = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_c_dir", "I");
-	GtkFileSelectionFc.fileop_del_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_del_file", "I");
-	GtkFileSelectionFc.fileop_ren_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_ren_file", "I");
-	GtkFileSelectionFc.button_area = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "button_area", "I");
-	GtkFileSelectionFc.action_area = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "action_area", "I");
+	GtkFileSelectionFc.dir_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "dir_list", I_J);
+	GtkFileSelectionFc.file_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "file_list", I_J);
+	GtkFileSelectionFc.selection_entry = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "selection_entry", I_J);
+	GtkFileSelectionFc.selection_text = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "selection_text", I_J);
+	GtkFileSelectionFc.main_vbox = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "main_vbox", I_J);
+	GtkFileSelectionFc.ok_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "ok_button", I_J);
+	GtkFileSelectionFc.cancel_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "cancel_button", I_J);
+	GtkFileSelectionFc.help_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "help_button", I_J);
+	GtkFileSelectionFc.history_pulldown = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_pulldown", I_J);
+	GtkFileSelectionFc.history_menu = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_menu", I_J);
+	GtkFileSelectionFc.history_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_list", I_J);
+	GtkFileSelectionFc.fileop_dialog = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_dialog", I_J);
+	GtkFileSelectionFc.fileop_entry = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_entry", I_J);
+	GtkFileSelectionFc.fileop_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_file", I_J);
+	GtkFileSelectionFc.cmpl_state = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "cmpl_state", I_J);
+	GtkFileSelectionFc.fileop_c_dir = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_c_dir", I_J);
+	GtkFileSelectionFc.fileop_del_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_del_file", I_J);
+	GtkFileSelectionFc.fileop_ren_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_ren_file", I_J);
+	GtkFileSelectionFc.button_area = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "button_area", I_J);
+	GtkFileSelectionFc.action_area = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "action_area", I_J);
 	GtkFileSelectionFc.cached = 1;
 }
 
 GtkFileSelection *getGtkFileSelectionFields(JNIEnv *env, jobject lpObject, GtkFileSelection *lpStruct)
 {
 	if (!GtkFileSelectionFc.cached) cacheGtkFileSelectionFields(env, lpObject);
-	lpStruct->dir_list = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.dir_list);
-	lpStruct->file_list = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.file_list);
-	lpStruct->selection_entry = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.selection_entry);
-	lpStruct->selection_text = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.selection_text);
-	lpStruct->main_vbox = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.main_vbox);
-	lpStruct->ok_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.ok_button);
-	lpStruct->cancel_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.cancel_button);
-	lpStruct->help_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.help_button);
-	lpStruct->history_pulldown = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.history_pulldown);
-	lpStruct->history_menu = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.history_menu);
-	lpStruct->history_list = (GList *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.history_list);
-	lpStruct->fileop_dialog = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_dialog);
-	lpStruct->fileop_entry = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_entry);
-	lpStruct->fileop_file = (gchar *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_file);
-	lpStruct->cmpl_state = (gpointer)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.cmpl_state);
-	lpStruct->fileop_c_dir = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_c_dir);
-	lpStruct->fileop_del_file = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_del_file);
-	lpStruct->fileop_ren_file = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_ren_file);
-	lpStruct->button_area = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.button_area);
-	lpStruct->action_area = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.action_area);
+	lpStruct->dir_list = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.dir_list);
+	lpStruct->file_list = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.file_list);
+	lpStruct->selection_entry = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.selection_entry);
+	lpStruct->selection_text = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.selection_text);
+	lpStruct->main_vbox = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.main_vbox);
+	lpStruct->ok_button = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.ok_button);
+	lpStruct->cancel_button = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.cancel_button);
+	lpStruct->help_button = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.help_button);
+	lpStruct->history_pulldown = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.history_pulldown);
+	lpStruct->history_menu = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.history_menu);
+	lpStruct->history_list = (GList *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.history_list);
+	lpStruct->fileop_dialog = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_dialog);
+	lpStruct->fileop_entry = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_entry);
+	lpStruct->fileop_file = (gchar *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_file);
+	lpStruct->cmpl_state = (gpointer)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.cmpl_state);
+	lpStruct->fileop_c_dir = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_c_dir);
+	lpStruct->fileop_del_file = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_del_file);
+	lpStruct->fileop_ren_file = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_ren_file);
+	lpStruct->button_area = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.button_area);
+	lpStruct->action_area = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.action_area);
 	return lpStruct;
 }
 
 void setGtkFileSelectionFields(JNIEnv *env, jobject lpObject, GtkFileSelection *lpStruct)
 {
 	if (!GtkFileSelectionFc.cached) cacheGtkFileSelectionFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.dir_list, (jint)lpStruct->dir_list);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.file_list, (jint)lpStruct->file_list);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.selection_entry, (jint)lpStruct->selection_entry);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.selection_text, (jint)lpStruct->selection_text);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.main_vbox, (jint)lpStruct->main_vbox);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.ok_button, (jint)lpStruct->ok_button);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.cancel_button, (jint)lpStruct->cancel_button);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.help_button, (jint)lpStruct->help_button);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.history_pulldown, (jint)lpStruct->history_pulldown);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.history_menu, (jint)lpStruct->history_menu);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.history_list, (jint)lpStruct->history_list);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_dialog, (jint)lpStruct->fileop_dialog);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_entry, (jint)lpStruct->fileop_entry);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_file, (jint)lpStruct->fileop_file);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.cmpl_state, (jint)lpStruct->cmpl_state);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_c_dir, (jint)lpStruct->fileop_c_dir);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_del_file, (jint)lpStruct->fileop_del_file);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_ren_file, (jint)lpStruct->fileop_ren_file);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.button_area, (jint)lpStruct->button_area);
-	(*env)->SetIntField(env, lpObject, GtkFileSelectionFc.action_area, (jint)lpStruct->action_area);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.dir_list, (jintLong)lpStruct->dir_list);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.file_list, (jintLong)lpStruct->file_list);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.selection_entry, (jintLong)lpStruct->selection_entry);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.selection_text, (jintLong)lpStruct->selection_text);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.main_vbox, (jintLong)lpStruct->main_vbox);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.ok_button, (jintLong)lpStruct->ok_button);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.cancel_button, (jintLong)lpStruct->cancel_button);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.help_button, (jintLong)lpStruct->help_button);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.history_pulldown, (jintLong)lpStruct->history_pulldown);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.history_menu, (jintLong)lpStruct->history_menu);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.history_list, (jintLong)lpStruct->history_list);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_dialog, (jintLong)lpStruct->fileop_dialog);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_entry, (jintLong)lpStruct->fileop_entry);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_file, (jintLong)lpStruct->fileop_file);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.cmpl_state, (jintLong)lpStruct->cmpl_state);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_c_dir, (jintLong)lpStruct->fileop_c_dir);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_del_file, (jintLong)lpStruct->fileop_del_file);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_ren_file, (jintLong)lpStruct->fileop_ren_file);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.button_area, (jintLong)lpStruct->button_area);
+	(*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.action_area, (jintLong)lpStruct->action_area);
 }
 #endif
 
@@ -1595,21 +1595,21 @@ void cacheGtkFixedFields(JNIEnv *env, jobject lpObject)
 {
 	if (GtkFixedFc.cached) return;
 	GtkFixedFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GtkFixedFc.children = (*env)->GetFieldID(env, GtkFixedFc.clazz, "children", "I");
+	GtkFixedFc.children = (*env)->GetFieldID(env, GtkFixedFc.clazz, "children", I_J);
 	GtkFixedFc.cached = 1;
 }
 
 GtkFixed *getGtkFixedFields(JNIEnv *env, jobject lpObject, GtkFixed *lpStruct)
 {
 	if (!GtkFixedFc.cached) cacheGtkFixedFields(env, lpObject);
-	lpStruct->children = (GList *)(*env)->GetIntField(env, lpObject, GtkFixedFc.children);
+	lpStruct->children = (GList *)(*env)->GetIntLongField(env, lpObject, GtkFixedFc.children);
 	return lpStruct;
 }
 
 void setGtkFixedFields(JNIEnv *env, jobject lpObject, GtkFixed *lpStruct)
 {
 	if (!GtkFixedFc.cached) cacheGtkFixedFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GtkFixedFc.children, (jint)lpStruct->children);
+	(*env)->SetIntLongField(env, lpObject, GtkFixedFc.children, (jintLong)lpStruct->children);
 }
 #endif
 
@@ -1660,11 +1660,11 @@ void cacheGtkSelectionDataFields(JNIEnv *env, jobject lpObject)
 {
 	if (GtkSelectionDataFc.cached) return;
 	GtkSelectionDataFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GtkSelectionDataFc.selection = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "selection", "I");
-	GtkSelectionDataFc.target = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "target", "I");
-	GtkSelectionDataFc.type = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "type", "I");
+	GtkSelectionDataFc.selection = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "selection", I_J);
+	GtkSelectionDataFc.target = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "target", I_J);
+	GtkSelectionDataFc.type = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "type", I_J);
 	GtkSelectionDataFc.format = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "format", "I");
-	GtkSelectionDataFc.data = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "data", "I");
+	GtkSelectionDataFc.data = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "data", I_J);
 	GtkSelectionDataFc.length = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "length", "I");
 	GtkSelectionDataFc.cached = 1;
 }
@@ -1672,11 +1672,11 @@ void cacheGtkSelectionDataFields(JNIEnv *env, jobject lpObject)
 GtkSelectionData *getGtkSelectionDataFields(JNIEnv *env, jobject lpObject, GtkSelectionData *lpStruct)
 {
 	if (!GtkSelectionDataFc.cached) cacheGtkSelectionDataFields(env, lpObject);
-	lpStruct->selection = (GdkAtom)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.selection);
-	lpStruct->target = (GdkAtom)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.target);
-	lpStruct->type = (GdkAtom)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.type);
+	lpStruct->selection = (GdkAtom)(*env)->GetIntLongField(env, lpObject, GtkSelectionDataFc.selection);
+	lpStruct->target = (GdkAtom)(*env)->GetIntLongField(env, lpObject, GtkSelectionDataFc.target);
+	lpStruct->type = (GdkAtom)(*env)->GetIntLongField(env, lpObject, GtkSelectionDataFc.type);
 	lpStruct->format = (gint)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.format);
-	lpStruct->data = (guchar *)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.data);
+	lpStruct->data = (guchar *)(*env)->GetIntLongField(env, lpObject, GtkSelectionDataFc.data);
 	lpStruct->length = (gint)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.length);
 	return lpStruct;
 }
@@ -1684,11 +1684,11 @@ GtkSelectionData *getGtkSelectionDataFields(JNIEnv *env, jobject lpObject, GtkSe
 void setGtkSelectionDataFields(JNIEnv *env, jobject lpObject, GtkSelectionData *lpStruct)
 {
 	if (!GtkSelectionDataFc.cached) cacheGtkSelectionDataFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GtkSelectionDataFc.selection, (jint)lpStruct->selection);
-	(*env)->SetIntField(env, lpObject, GtkSelectionDataFc.target, (jint)lpStruct->target);
-	(*env)->SetIntField(env, lpObject, GtkSelectionDataFc.type, (jint)lpStruct->type);
+	(*env)->SetIntLongField(env, lpObject, GtkSelectionDataFc.selection, (jintLong)lpStruct->selection);
+	(*env)->SetIntLongField(env, lpObject, GtkSelectionDataFc.target, (jintLong)lpStruct->target);
+	(*env)->SetIntLongField(env, lpObject, GtkSelectionDataFc.type, (jintLong)lpStruct->type);
 	(*env)->SetIntField(env, lpObject, GtkSelectionDataFc.format, (jint)lpStruct->format);
-	(*env)->SetIntField(env, lpObject, GtkSelectionDataFc.data, (jint)lpStruct->data);
+	(*env)->SetIntLongField(env, lpObject, GtkSelectionDataFc.data, (jintLong)lpStruct->data);
 	(*env)->SetIntField(env, lpObject, GtkSelectionDataFc.length, (jint)lpStruct->length);
 }
 #endif
@@ -1706,7 +1706,7 @@ void cacheGtkTargetEntryFields(JNIEnv *env, jobject lpObject)
 {
 	if (GtkTargetEntryFc.cached) return;
 	GtkTargetEntryFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GtkTargetEntryFc.target = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "target", "I");
+	GtkTargetEntryFc.target = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "target", I_J);
 	GtkTargetEntryFc.flags = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "flags", "I");
 	GtkTargetEntryFc.info = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "info", "I");
 	GtkTargetEntryFc.cached = 1;
@@ -1715,7 +1715,7 @@ void cacheGtkTargetEntryFields(JNIEnv *env, jobject lpObject)
 GtkTargetEntry *getGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTargetEntry *lpStruct)
 {
 	if (!GtkTargetEntryFc.cached) cacheGtkTargetEntryFields(env, lpObject);
-	lpStruct->target = (gchar *)(*env)->GetIntField(env, lpObject, GtkTargetEntryFc.target);
+	lpStruct->target = (gchar *)(*env)->GetIntLongField(env, lpObject, GtkTargetEntryFc.target);
 	lpStruct->flags = (guint)(*env)->GetIntField(env, lpObject, GtkTargetEntryFc.flags);
 	lpStruct->info = (guint)(*env)->GetIntField(env, lpObject, GtkTargetEntryFc.info);
 	return lpStruct;
@@ -1724,7 +1724,7 @@ GtkTargetEntry *getGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTarget
 void setGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTargetEntry *lpStruct)
 {
 	if (!GtkTargetEntryFc.cached) cacheGtkTargetEntryFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GtkTargetEntryFc.target, (jint)lpStruct->target);
+	(*env)->SetIntLongField(env, lpObject, GtkTargetEntryFc.target, (jintLong)lpStruct->target);
 	(*env)->SetIntField(env, lpObject, GtkTargetEntryFc.flags, (jint)lpStruct->flags);
 	(*env)->SetIntField(env, lpObject, GtkTargetEntryFc.info, (jint)lpStruct->info);
 }
@@ -1743,7 +1743,7 @@ void cacheGtkTargetPairFields(JNIEnv *env, jobject lpObject)
 {
 	if (GtkTargetPairFc.cached) return;
 	GtkTargetPairFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GtkTargetPairFc.target = (*env)->GetFieldID(env, GtkTargetPairFc.clazz, "target", "I");
+	GtkTargetPairFc.target = (*env)->GetFieldID(env, GtkTargetPairFc.clazz, "target", I_J);
 	GtkTargetPairFc.flags = (*env)->GetFieldID(env, GtkTargetPairFc.clazz, "flags", "I");
 	GtkTargetPairFc.info = (*env)->GetFieldID(env, GtkTargetPairFc.clazz, "info", "I");
 	GtkTargetPairFc.cached = 1;
@@ -1752,7 +1752,7 @@ void cacheGtkTargetPairFields(JNIEnv *env, jobject lpObject)
 GtkTargetPair *getGtkTargetPairFields(JNIEnv *env, jobject lpObject, GtkTargetPair *lpStruct)
 {
 	if (!GtkTargetPairFc.cached) cacheGtkTargetPairFields(env, lpObject);
-	lpStruct->target = (GdkAtom)(*env)->GetIntField(env, lpObject, GtkTargetPairFc.target);
+	lpStruct->target = (GdkAtom)(*env)->GetIntLongField(env, lpObject, GtkTargetPairFc.target);
 	lpStruct->flags = (guint)(*env)->GetIntField(env, lpObject, GtkTargetPairFc.flags);
 	lpStruct->info = (guint)(*env)->GetIntField(env, lpObject, GtkTargetPairFc.info);
 	return lpStruct;
@@ -1761,7 +1761,7 @@ GtkTargetPair *getGtkTargetPairFields(JNIEnv *env, jobject lpObject, GtkTargetPa
 void setGtkTargetPairFields(JNIEnv *env, jobject lpObject, GtkTargetPair *lpStruct)
 {
 	if (!GtkTargetPairFc.cached) cacheGtkTargetPairFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GtkTargetPairFc.target, (jint)lpStruct->target);
+	(*env)->SetIntLongField(env, lpObject, GtkTargetPairFc.target, (jintLong)lpStruct->target);
 	(*env)->SetIntField(env, lpObject, GtkTargetPairFc.flags, (jint)lpStruct->flags);
 	(*env)->SetIntField(env, lpObject, GtkTargetPairFc.info, (jint)lpStruct->info);
 }
@@ -1783,68 +1783,68 @@ void cacheGtkWidgetClassFields(JNIEnv *env, jobject lpObject)
 	GtkWidgetClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	GtkWidgetClassFc.activate_signal = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "activate_signal", "I");
 	GtkWidgetClassFc.set_scroll_adjustments_signal = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "set_scroll_adjustments_signal", "I");
-	GtkWidgetClassFc.dispatch_child_properties_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "dispatch_child_properties_changed", "I");
-	GtkWidgetClassFc.show = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show", "I");
-	GtkWidgetClassFc.show_all = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show_all", "I");
-	GtkWidgetClassFc.hide = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hide", "I");
-	GtkWidgetClassFc.hide_all = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hide_all", "I");
-	GtkWidgetClassFc.map = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map", "I");
-	GtkWidgetClassFc.unmap = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unmap", "I");
-	GtkWidgetClassFc.realize = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "realize", "I");
-	GtkWidgetClassFc.unrealize = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unrealize", "I");
-	GtkWidgetClassFc.size_request = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_request", "I");
-	GtkWidgetClassFc.size_allocate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_allocate", "I");
-	GtkWidgetClassFc.state_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "state_changed", "I");
-	GtkWidgetClassFc.parent_set = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "parent_set", "I");
-	GtkWidgetClassFc.hierarchy_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hierarchy_changed", "I");
-	GtkWidgetClassFc.style_set = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "style_set", "I");
-	GtkWidgetClassFc.direction_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "direction_changed", "I");
-	GtkWidgetClassFc.grab_notify = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "grab_notify", "I");
-	GtkWidgetClassFc.child_notify = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "child_notify", "I");
-	GtkWidgetClassFc.mnemonic_activate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "mnemonic_activate", "I");
-	GtkWidgetClassFc.grab_focus = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "grab_focus", "I");
-	GtkWidgetClassFc.focus = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus", "I");
-	GtkWidgetClassFc.event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "event", "I");
-	GtkWidgetClassFc.button_press_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "button_press_event", "I");
-	GtkWidgetClassFc.button_release_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "button_release_event", "I");
-	GtkWidgetClassFc.scroll_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "scroll_event", "I");
-	GtkWidgetClassFc.motion_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "motion_notify_event", "I");
-	GtkWidgetClassFc.delete_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "delete_event", "I");
-	GtkWidgetClassFc.destroy_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "destroy_event", "I");
-	GtkWidgetClassFc.expose_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "expose_event", "I");
-	GtkWidgetClassFc.key_press_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "key_press_event", "I");
-	GtkWidgetClassFc.key_release_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "key_release_event", "I");
-	GtkWidgetClassFc.enter_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "enter_notify_event", "I");
-	GtkWidgetClassFc.leave_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "leave_notify_event", "I");
-	GtkWidgetClassFc.configure_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "configure_event", "I");
-	GtkWidgetClassFc.focus_in_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus_in_event", "I");
-	GtkWidgetClassFc.focus_out_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus_out_event", "I");
-	GtkWidgetClassFc.map_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map_event", "I");
-	GtkWidgetClassFc.unmap_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unmap_event", "I");
-	GtkWidgetClassFc.property_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "property_notify_event", "I");
-	GtkWidgetClassFc.selection_clear_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_clear_event", "I");
-	GtkWidgetClassFc.selection_request_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_request_event", "I");
-	GtkWidgetClassFc.selection_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_notify_event", "I");
-	GtkWidgetClassFc.proximity_in_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "proximity_in_event", "I");
-	GtkWidgetClassFc.proximity_out_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "proximity_out_event", "I");
-	GtkWidgetClassFc.visibility_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "visibility_notify_event", "I");
-	GtkWidgetClassFc.client_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "client_event", "I");
-	GtkWidgetClassFc.no_expose_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "no_expose_event", "I");
-	GtkWidgetClassFc.window_state_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "window_state_event", "I");
-	GtkWidgetClassFc.selection_get = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_get", "I");
-	GtkWidgetClassFc.selection_received = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_received", "I");
-	GtkWidgetClassFc.drag_begin = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_begin", "I");
-	GtkWidgetClassFc.drag_end = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_end", "I");
-	GtkWidgetClassFc.drag_data_get = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_get", "I");
-	GtkWidgetClassFc.drag_data_delete = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_delete", "I");
-	GtkWidgetClassFc.drag_leave = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_leave", "I");
-	GtkWidgetClassFc.drag_motion = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_motion", "I");
-	GtkWidgetClassFc.drag_drop = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_drop", "I");
-	GtkWidgetClassFc.drag_data_received = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_received", "I");
-	GtkWidgetClassFc.popup_menu = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "popup_menu", "I");
-	GtkWidgetClassFc.show_help = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show_help", "I");
-	GtkWidgetClassFc.get_accessible = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "get_accessible", "I");
-	GtkWidgetClassFc.screen_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "screen_changed", "I");
+	GtkWidgetClassFc.dispatch_child_properties_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "dispatch_child_properties_changed", I_J);
+	GtkWidgetClassFc.show = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show", I_J);
+	GtkWidgetClassFc.show_all = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show_all", I_J);
+	GtkWidgetClassFc.hide = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hide", I_J);
+	GtkWidgetClassFc.hide_all = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hide_all", I_J);
+	GtkWidgetClassFc.map = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map", I_J);
+	GtkWidgetClassFc.unmap = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unmap", I_J);
+	GtkWidgetClassFc.realize = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "realize", I_J);
+	GtkWidgetClassFc.unrealize = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unrealize", I_J);
+	GtkWidgetClassFc.size_request = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_request", I_J);
+	GtkWidgetClassFc.size_allocate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_allocate", I_J);
+	GtkWidgetClassFc.state_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "state_changed", I_J);
+	GtkWidgetClassFc.parent_set = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "parent_set", I_J);
+	GtkWidgetClassFc.hierarchy_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hierarchy_changed", I_J);
+	GtkWidgetClassFc.style_set = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "style_set", I_J);
+	GtkWidgetClassFc.direction_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "direction_changed", I_J);
+	GtkWidgetClassFc.grab_notify = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "grab_notify", I_J);
+	GtkWidgetClassFc.child_notify = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "child_notify", I_J);
+	GtkWidgetClassFc.mnemonic_activate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "mnemonic_activate", I_J);
+	GtkWidgetClassFc.grab_focus = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "grab_focus", I_J);
+	GtkWidgetClassFc.focus = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus", I_J);
+	GtkWidgetClassFc.event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "event", I_J);
+	GtkWidgetClassFc.button_press_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "button_press_event", I_J);
+	GtkWidgetClassFc.button_release_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "button_release_event", I_J);
+	GtkWidgetClassFc.scroll_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "scroll_event", I_J);
+	GtkWidgetClassFc.motion_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "motion_notify_event", I_J);
+	GtkWidgetClassFc.delete_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "delete_event", I_J);
+	GtkWidgetClassFc.destroy_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "destroy_event", I_J);
+	GtkWidgetClassFc.expose_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "expose_event", I_J);
+	GtkWidgetClassFc.key_press_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "key_press_event", I_J);
+	GtkWidgetClassFc.key_release_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "key_release_event", I_J);
+	GtkWidgetClassFc.enter_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "enter_notify_event", I_J);
+	GtkWidgetClassFc.leave_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "leave_notify_event", I_J);
+	GtkWidgetClassFc.configure_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "configure_event", I_J);
+	GtkWidgetClassFc.focus_in_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus_in_event", I_J);
+	GtkWidgetClassFc.focus_out_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus_out_event", I_J);
+	GtkWidgetClassFc.map_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map_event", I_J);
+	GtkWidgetClassFc.unmap_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unmap_event", I_J);
+	GtkWidgetClassFc.property_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "property_notify_event", I_J);
+	GtkWidgetClassFc.selection_clear_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_clear_event", I_J);
+	GtkWidgetClassFc.selection_request_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_request_event", I_J);
+	GtkWidgetClassFc.selection_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_notify_event", I_J);
+	GtkWidgetClassFc.proximity_in_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "proximity_in_event", I_J);
+	GtkWidgetClassFc.proximity_out_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "proximity_out_event", I_J);
+	GtkWidgetClassFc.visibility_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "visibility_notify_event", I_J);
+	GtkWidgetClassFc.client_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "client_event", I_J);
+	GtkWidgetClassFc.no_expose_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "no_expose_event", I_J);
+	GtkWidgetClassFc.window_state_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "window_state_event", I_J);
+	GtkWidgetClassFc.selection_get = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_get", I_J);
+	GtkWidgetClassFc.selection_received = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_received", I_J);
+	GtkWidgetClassFc.drag_begin = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_begin", I_J);
+	GtkWidgetClassFc.drag_end = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_end", I_J);
+	GtkWidgetClassFc.drag_data_get = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_get", I_J);
+	GtkWidgetClassFc.drag_data_delete = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_delete", I_J);
+	GtkWidgetClassFc.drag_leave = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_leave", I_J);
+	GtkWidgetClassFc.drag_motion = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_motion", I_J);
+	GtkWidgetClassFc.drag_drop = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_drop", I_J);
+	GtkWidgetClassFc.drag_data_received = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_received", I_J);
+	GtkWidgetClassFc.popup_menu = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "popup_menu", I_J);
+	GtkWidgetClassFc.show_help = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show_help", I_J);
+	GtkWidgetClassFc.get_accessible = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "get_accessible", I_J);
+	GtkWidgetClassFc.screen_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "screen_changed", I_J);
 	GtkWidgetClassFc.cached = 1;
 }
 
@@ -1854,68 +1854,68 @@ GtkWidgetClass *getGtkWidgetClassFields(JNIEnv *env, jobject lpObject, GtkWidget
 	getGObjectClassFields(env, lpObject, (GObjectClass *)lpStruct);
 	lpStruct->activate_signal = (*env)->GetIntField(env, lpObject, GtkWidgetClassFc.activate_signal);
 	lpStruct->set_scroll_adjustments_signal = (*env)->GetIntField(env, lpObject, GtkWidgetClassFc.set_scroll_adjustments_signal);
-	lpStruct->dispatch_child_properties_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.dispatch_child_properties_changed);
-	lpStruct->show = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.show);
-	lpStruct->show_all = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.show_all);
-	lpStruct->hide = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.hide);
-	lpStruct->hide_all = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.hide_all);
-	lpStruct->map = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.map);
-	lpStruct->unmap = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.unmap);
-	lpStruct->realize = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.realize);
-	lpStruct->unrealize = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.unrealize);
-	lpStruct->size_request = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.size_request);
-	lpStruct->size_allocate = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.size_allocate);
-	lpStruct->state_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.state_changed);
-	lpStruct->parent_set = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.parent_set);
-	lpStruct->hierarchy_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.hierarchy_changed);
-	lpStruct->style_set = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.style_set);
-	lpStruct->direction_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.direction_changed);
-	lpStruct->grab_notify = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.grab_notify);
-	lpStruct->child_notify = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.child_notify);
-	lpStruct->mnemonic_activate = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.mnemonic_activate);
-	lpStruct->grab_focus = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.grab_focus);
-	lpStruct->focus = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.focus);
-	lpStruct->event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.event);
-	lpStruct->button_press_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.button_press_event);
-	lpStruct->button_release_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.button_release_event);
-	lpStruct->scroll_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.scroll_event);
-	lpStruct->motion_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.motion_notify_event);
-	lpStruct->delete_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.delete_event);
-	lpStruct->destroy_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.destroy_event);
-	lpStruct->expose_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.expose_event);
-	lpStruct->key_press_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.key_press_event);
-	lpStruct->key_release_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.key_release_event);
-	lpStruct->enter_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.enter_notify_event);
-	lpStruct->leave_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.leave_notify_event);
-	lpStruct->configure_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.configure_event);
-	lpStruct->focus_in_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.focus_in_event);
-	lpStruct->focus_out_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.focus_out_event);
-	lpStruct->map_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.map_event);
-	lpStruct->unmap_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.unmap_event);
-	lpStruct->property_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.property_notify_event);
-	lpStruct->selection_clear_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_clear_event);
-	lpStruct->selection_request_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_request_event);
-	lpStruct->selection_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_notify_event);
-	lpStruct->proximity_in_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.proximity_in_event);
-	lpStruct->proximity_out_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.proximity_out_event);
-	lpStruct->visibility_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.visibility_notify_event);
-	lpStruct->client_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.client_event);
-	lpStruct->no_expose_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.no_expose_event);
-	lpStruct->window_state_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.window_state_event);
-	lpStruct->selection_get = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_get);
-	lpStruct->selection_received = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_received);
-	lpStruct->drag_begin = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_begin);
-	lpStruct->drag_end = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_end);
-	lpStruct->drag_data_get = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_data_get);
-	lpStruct->drag_data_delete = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_data_delete);
-	lpStruct->drag_leave = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_leave);
-	lpStruct->drag_motion = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_motion);
-	lpStruct->drag_drop = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_drop);
-	lpStruct->drag_data_received = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_data_received);
-	lpStruct->popup_menu = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.popup_menu);
-	lpStruct->show_help = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.show_help);
-	lpStruct->get_accessible = (AtkObject*(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.get_accessible);
-	lpStruct->screen_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.screen_changed);
+	lpStruct->dispatch_child_properties_changed = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.dispatch_child_properties_changed);
+	lpStruct->show = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.show);
+	lpStruct->show_all = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.show_all);
+	lpStruct->hide = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.hide);
+	lpStruct->hide_all = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.hide_all);
+	lpStruct->map = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.map);
+	lpStruct->unmap = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.unmap);
+	lpStruct->realize = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.realize);
+	lpStruct->unrealize = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.unrealize);
+	lpStruct->size_request = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.size_request);
+	lpStruct->size_allocate = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.size_allocate);
+	lpStruct->state_changed = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.state_changed);
+	lpStruct->parent_set = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.parent_set);
+	lpStruct->hierarchy_changed = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.hierarchy_changed);
+	lpStruct->style_set = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.style_set);
+	lpStruct->direction_changed = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.direction_changed);
+	lpStruct->grab_notify = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.grab_notify);
+	lpStruct->child_notify = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.child_notify);
+	lpStruct->mnemonic_activate = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.mnemonic_activate);
+	lpStruct->grab_focus = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.grab_focus);
+	lpStruct->focus = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.focus);
+	lpStruct->event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.event);
+	lpStruct->button_press_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.button_press_event);
+	lpStruct->button_release_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.button_release_event);
+	lpStruct->scroll_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.scroll_event);
+	lpStruct->motion_notify_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.motion_notify_event);
+	lpStruct->delete_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.delete_event);
+	lpStruct->destroy_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.destroy_event);
+	lpStruct->expose_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.expose_event);
+	lpStruct->key_press_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.key_press_event);
+	lpStruct->key_release_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.key_release_event);
+	lpStruct->enter_notify_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.enter_notify_event);
+	lpStruct->leave_notify_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.leave_notify_event);
+	lpStruct->configure_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.configure_event);
+	lpStruct->focus_in_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.focus_in_event);
+	lpStruct->focus_out_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.focus_out_event);
+	lpStruct->map_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.map_event);
+	lpStruct->unmap_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.unmap_event);
+	lpStruct->property_notify_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.property_notify_event);
+	lpStruct->selection_clear_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.selection_clear_event);
+	lpStruct->selection_request_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.selection_request_event);
+	lpStruct->selection_notify_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.selection_notify_event);
+	lpStruct->proximity_in_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.proximity_in_event);
+	lpStruct->proximity_out_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.proximity_out_event);
+	lpStruct->visibility_notify_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.visibility_notify_event);
+	lpStruct->client_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.client_event);
+	lpStruct->no_expose_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.no_expose_event);
+	lpStruct->window_state_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.window_state_event);
+	lpStruct->selection_get = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.selection_get);
+	lpStruct->selection_received = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.selection_received);
+	lpStruct->drag_begin = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_begin);
+	lpStruct->drag_end = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_end);
+	lpStruct->drag_data_get = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_data_get);
+	lpStruct->drag_data_delete = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_data_delete);
+	lpStruct->drag_leave = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_leave);
+	lpStruct->drag_motion = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_motion);
+	lpStruct->drag_drop = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_drop);
+	lpStruct->drag_data_received = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_data_received);
+	lpStruct->popup_menu = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.popup_menu);
+	lpStruct->show_help = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.show_help);
+	lpStruct->get_accessible = (AtkObject*(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.get_accessible);
+	lpStruct->screen_changed = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.screen_changed);
 	return lpStruct;
 }
 
@@ -1925,68 +1925,68 @@ void setGtkWidgetClassFields(JNIEnv *env, jobject lpObject, GtkWidgetClass *lpSt
 	setGObjectClassFields(env, lpObject, (GObjectClass *)lpStruct);
 	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.activate_signal, (jint)lpStruct->activate_signal);
 	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.set_scroll_adjustments_signal, (jint)lpStruct->set_scroll_adjustments_signal);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.dispatch_child_properties_changed, (jint)lpStruct->dispatch_child_properties_changed);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.show, (jint)lpStruct->show);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.show_all, (jint)lpStruct->show_all);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.hide, (jint)lpStruct->hide);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.hide_all, (jint)lpStruct->hide_all);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.map, (jint)lpStruct->map);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.unmap, (jint)lpStruct->unmap);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.realize, (jint)lpStruct->realize);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.unrealize, (jint)lpStruct->unrealize);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.size_request, (jint)lpStruct->size_request);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.size_allocate, (jint)lpStruct->size_allocate);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.state_changed, (jint)lpStruct->state_changed);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.parent_set, (jint)lpStruct->parent_set);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.hierarchy_changed, (jint)lpStruct->hierarchy_changed);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.style_set, (jint)lpStruct->style_set);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.direction_changed, (jint)lpStruct->direction_changed);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.grab_notify, (jint)lpStruct->grab_notify);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.child_notify, (jint)lpStruct->child_notify);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.mnemonic_activate, (jint)lpStruct->mnemonic_activate);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.grab_focus, (jint)lpStruct->grab_focus);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.focus, (jint)lpStruct->focus);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.event, (jint)lpStruct->event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.button_press_event, (jint)lpStruct->button_press_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.button_release_event, (jint)lpStruct->button_release_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.scroll_event, (jint)lpStruct->scroll_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.motion_notify_event, (jint)lpStruct->motion_notify_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.delete_event, (jint)lpStruct->delete_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.destroy_event, (jint)lpStruct->destroy_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.expose_event, (jint)lpStruct->expose_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.key_press_event, (jint)lpStruct->key_press_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.key_release_event, (jint)lpStruct->key_release_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.enter_notify_event, (jint)lpStruct->enter_notify_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.leave_notify_event, (jint)lpStruct->leave_notify_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.configure_event, (jint)lpStruct->configure_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.focus_in_event, (jint)lpStruct->focus_in_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.focus_out_event, (jint)lpStruct->focus_out_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.map_event, (jint)lpStruct->map_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.unmap_event, (jint)lpStruct->unmap_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.property_notify_event, (jint)lpStruct->property_notify_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_clear_event, (jint)lpStruct->selection_clear_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_request_event, (jint)lpStruct->selection_request_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_notify_event, (jint)lpStruct->selection_notify_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.proximity_in_event, (jint)lpStruct->proximity_in_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.proximity_out_event, (jint)lpStruct->proximity_out_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.visibility_notify_event, (jint)lpStruct->visibility_notify_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.client_event, (jint)lpStruct->client_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.no_expose_event, (jint)lpStruct->no_expose_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.window_state_event, (jint)lpStruct->window_state_event);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_get, (jint)lpStruct->selection_get);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_received, (jint)lpStruct->selection_received);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_begin, (jint)lpStruct->drag_begin);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_end, (jint)lpStruct->drag_end);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_data_get, (jint)lpStruct->drag_data_get);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_data_delete, (jint)lpStruct->drag_data_delete);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_leave, (jint)lpStruct->drag_leave);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_motion, (jint)lpStruct->drag_motion);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_drop, (jint)lpStruct->drag_drop);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_data_received, (jint)lpStruct->drag_data_received);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.popup_menu, (jint)lpStruct->popup_menu);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.show_help, (jint)lpStruct->show_help);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.get_accessible, (jint)lpStruct->get_accessible);
-	(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.screen_changed, (jint)lpStruct->screen_changed);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.dispatch_child_properties_changed, (jintLong)lpStruct->dispatch_child_properties_changed);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.show, (jintLong)lpStruct->show);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.show_all, (jintLong)lpStruct->show_all);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.hide, (jintLong)lpStruct->hide);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.hide_all, (jintLong)lpStruct->hide_all);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.map, (jintLong)lpStruct->map);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.unmap, (jintLong)lpStruct->unmap);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.realize, (jintLong)lpStruct->realize);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.unrealize, (jintLong)lpStruct->unrealize);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.size_request, (jintLong)lpStruct->size_request);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.size_allocate, (jintLong)lpStruct->size_allocate);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.state_changed, (jintLong)lpStruct->state_changed);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.parent_set, (jintLong)lpStruct->parent_set);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.hierarchy_changed, (jintLong)lpStruct->hierarchy_changed);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.style_set, (jintLong)lpStruct->style_set);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.direction_changed, (jintLong)lpStruct->direction_changed);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.grab_notify, (jintLong)lpStruct->grab_notify);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.child_notify, (jintLong)lpStruct->child_notify);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.mnemonic_activate, (jintLong)lpStruct->mnemonic_activate);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.grab_focus, (jintLong)lpStruct->grab_focus);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.focus, (jintLong)lpStruct->focus);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.event, (jintLong)lpStruct->event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.button_press_event, (jintLong)lpStruct->button_press_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.button_release_event, (jintLong)lpStruct->button_release_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.scroll_event, (jintLong)lpStruct->scroll_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.motion_notify_event, (jintLong)lpStruct->motion_notify_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.delete_event, (jintLong)lpStruct->delete_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.destroy_event, (jintLong)lpStruct->destroy_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.expose_event, (jintLong)lpStruct->expose_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.key_press_event, (jintLong)lpStruct->key_press_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.key_release_event, (jintLong)lpStruct->key_release_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.enter_notify_event, (jintLong)lpStruct->enter_notify_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.leave_notify_event, (jintLong)lpStruct->leave_notify_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.configure_event, (jintLong)lpStruct->configure_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.focus_in_event, (jintLong)lpStruct->focus_in_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.focus_out_event, (jintLong)lpStruct->focus_out_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.map_event, (jintLong)lpStruct->map_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.unmap_event, (jintLong)lpStruct->unmap_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.property_notify_event, (jintLong)lpStruct->property_notify_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.selection_clear_event, (jintLong)lpStruct->selection_clear_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.selection_request_event, (jintLong)lpStruct->selection_request_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.selection_notify_event, (jintLong)lpStruct->selection_notify_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.proximity_in_event, (jintLong)lpStruct->proximity_in_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.proximity_out_event, (jintLong)lpStruct->proximity_out_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.visibility_notify_event, (jintLong)lpStruct->visibility_notify_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.client_event, (jintLong)lpStruct->client_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.no_expose_event, (jintLong)lpStruct->no_expose_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.window_state_event, (jintLong)lpStruct->window_state_event);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.selection_get, (jintLong)lpStruct->selection_get);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.selection_received, (jintLong)lpStruct->selection_received);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_begin, (jintLong)lpStruct->drag_begin);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_end, (jintLong)lpStruct->drag_end);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_data_get, (jintLong)lpStruct->drag_data_get);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_data_delete, (jintLong)lpStruct->drag_data_delete);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_leave, (jintLong)lpStruct->drag_leave);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_motion, (jintLong)lpStruct->drag_motion);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_drop, (jintLong)lpStruct->drag_drop);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_data_received, (jintLong)lpStruct->drag_data_received);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.popup_menu, (jintLong)lpStruct->popup_menu);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.show_help, (jintLong)lpStruct->show_help);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.get_accessible, (jintLong)lpStruct->get_accessible);
+	(*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.screen_changed, (jintLong)lpStruct->screen_changed);
 }
 #endif
 
@@ -2077,7 +2077,7 @@ void cachePangoAttributeFields(JNIEnv *env, jobject lpObject)
 {
 	if (PangoAttributeFc.cached) return;
 	PangoAttributeFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	PangoAttributeFc.klass = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "klass", "I");
+	PangoAttributeFc.klass = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "klass", I_J);
 	PangoAttributeFc.start_index = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "start_index", "I");
 	PangoAttributeFc.end_index = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "end_index", "I");
 	PangoAttributeFc.cached = 1;
@@ -2086,7 +2086,7 @@ void cachePangoAttributeFields(JNIEnv *env, jobject lpObject)
 PangoAttribute *getPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttribute *lpStruct)
 {
 	if (!PangoAttributeFc.cached) cachePangoAttributeFields(env, lpObject);
-	lpStruct->klass = (const PangoAttrClass *)(*env)->GetIntField(env, lpObject, PangoAttributeFc.klass);
+	lpStruct->klass = (const PangoAttrClass *)(*env)->GetIntLongField(env, lpObject, PangoAttributeFc.klass);
 	lpStruct->start_index = (*env)->GetIntField(env, lpObject, PangoAttributeFc.start_index);
 	lpStruct->end_index = (*env)->GetIntField(env, lpObject, PangoAttributeFc.end_index);
 	return lpStruct;
@@ -2095,7 +2095,7 @@ PangoAttribute *getPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttr
 void setPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttribute *lpStruct)
 {
 	if (!PangoAttributeFc.cached) cachePangoAttributeFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, PangoAttributeFc.klass, (jint)lpStruct->klass);
+	(*env)->SetIntLongField(env, lpObject, PangoAttributeFc.klass, (jintLong)lpStruct->klass);
 	(*env)->SetIntField(env, lpObject, PangoAttributeFc.start_index, (jint)lpStruct->start_index);
 	(*env)->SetIntField(env, lpObject, PangoAttributeFc.end_index, (jint)lpStruct->end_index);
 }
@@ -2117,12 +2117,12 @@ void cachePangoItemFields(JNIEnv *env, jobject lpObject)
 	PangoItemFc.offset = (*env)->GetFieldID(env, PangoItemFc.clazz, "offset", "I");
 	PangoItemFc.length = (*env)->GetFieldID(env, PangoItemFc.clazz, "length", "I");
 	PangoItemFc.num_chars = (*env)->GetFieldID(env, PangoItemFc.clazz, "num_chars", "I");
-	PangoItemFc.analysis_shape_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_shape_engine", "I");
-	PangoItemFc.analysis_lang_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_lang_engine", "I");
-	PangoItemFc.analysis_font = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_font", "I");
+	PangoItemFc.analysis_shape_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_shape_engine", I_J);
+	PangoItemFc.analysis_lang_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_lang_engine", I_J);
+	PangoItemFc.analysis_font = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_font", I_J);
 	PangoItemFc.analysis_level = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_level", "B");
-	PangoItemFc.analysis_language = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_language", "I");
-	PangoItemFc.analysis_extra_attrs = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_extra_attrs", "I");
+	PangoItemFc.analysis_language = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_language", I_J);
+	PangoItemFc.analysis_extra_attrs = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_extra_attrs", I_J);
 	PangoItemFc.cached = 1;
 }
 
@@ -2132,12 +2132,12 @@ PangoItem *getPangoItemFields(JNIEnv *env, jobject lpObject, PangoItem *lpStruct
 	lpStruct->offset = (*env)->GetIntField(env, lpObject, PangoItemFc.offset);
 	lpStruct->length = (*env)->GetIntField(env, lpObject, PangoItemFc.length);
 	lpStruct->num_chars = (*env)->GetIntField(env, lpObject, PangoItemFc.num_chars);
-	lpStruct->analysis.shape_engine = (PangoEngineShape *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_shape_engine);
-	lpStruct->analysis.lang_engine = (PangoEngineLang *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_lang_engine);
-	lpStruct->analysis.font = (PangoFont *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_font);
+	lpStruct->analysis.shape_engine = (PangoEngineShape *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_shape_engine);
+	lpStruct->analysis.lang_engine = (PangoEngineLang *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_lang_engine);
+	lpStruct->analysis.font = (PangoFont *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_font);
 	lpStruct->analysis.level = (*env)->GetByteField(env, lpObject, PangoItemFc.analysis_level);
-	lpStruct->analysis.language = (PangoLanguage *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_language);
-	lpStruct->analysis.extra_attrs = (GSList *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_extra_attrs);
+	lpStruct->analysis.language = (PangoLanguage *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_language);
+	lpStruct->analysis.extra_attrs = (GSList *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_extra_attrs);
 	return lpStruct;
 }
 
@@ -2147,12 +2147,12 @@ void setPangoItemFields(JNIEnv *env, jobject lpObject, PangoItem *lpStruct)
 	(*env)->SetIntField(env, lpObject, PangoItemFc.offset, (jint)lpStruct->offset);
 	(*env)->SetIntField(env, lpObject, PangoItemFc.length, (jint)lpStruct->length);
 	(*env)->SetIntField(env, lpObject, PangoItemFc.num_chars, (jint)lpStruct->num_chars);
-	(*env)->SetIntField(env, lpObject, PangoItemFc.analysis_shape_engine, (jint)lpStruct->analysis.shape_engine);
-	(*env)->SetIntField(env, lpObject, PangoItemFc.analysis_lang_engine, (jint)lpStruct->analysis.lang_engine);
-	(*env)->SetIntField(env, lpObject, PangoItemFc.analysis_font, (jint)lpStruct->analysis.font);
+	(*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_shape_engine, (jintLong)lpStruct->analysis.shape_engine);
+	(*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_lang_engine, (jintLong)lpStruct->analysis.lang_engine);
+	(*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_font, (jintLong)lpStruct->analysis.font);
 	(*env)->SetByteField(env, lpObject, PangoItemFc.analysis_level, (jbyte)lpStruct->analysis.level);
-	(*env)->SetIntField(env, lpObject, PangoItemFc.analysis_language, (jint)lpStruct->analysis.language);
-	(*env)->SetIntField(env, lpObject, PangoItemFc.analysis_extra_attrs, (jint)lpStruct->analysis.extra_attrs);
+	(*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_language, (jintLong)lpStruct->analysis.language);
+	(*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_extra_attrs, (jintLong)lpStruct->analysis.extra_attrs);
 }
 #endif
 
@@ -2169,30 +2169,30 @@ void cachePangoLayoutLineFields(JNIEnv *env, jobject lpObject)
 {
 	if (PangoLayoutLineFc.cached) return;
 	PangoLayoutLineFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	PangoLayoutLineFc.layout = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "layout", "I");
+	PangoLayoutLineFc.layout = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "layout", I_J);
 	PangoLayoutLineFc.start_index = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "start_index", "I");
 	PangoLayoutLineFc.length = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "length", "I");
-	PangoLayoutLineFc.runs = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "runs", "I");
+	PangoLayoutLineFc.runs = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "runs", I_J);
 	PangoLayoutLineFc.cached = 1;
 }
 
 PangoLayoutLine *getPangoLayoutLineFields(JNIEnv *env, jobject lpObject, PangoLayoutLine *lpStruct)
 {
 	if (!PangoLayoutLineFc.cached) cachePangoLayoutLineFields(env, lpObject);
-	lpStruct->layout = (PangoLayout *)(*env)->GetIntField(env, lpObject, PangoLayoutLineFc.layout);
+	lpStruct->layout = (PangoLayout *)(*env)->GetIntLongField(env, lpObject, PangoLayoutLineFc.layout);
 	lpStruct->start_index = (*env)->GetIntField(env, lpObject, PangoLayoutLineFc.start_index);
 	lpStruct->length = (*env)->GetIntField(env, lpObject, PangoLayoutLineFc.length);
-	lpStruct->runs = (GSList *)(*env)->GetIntField(env, lpObject, PangoLayoutLineFc.runs);
+	lpStruct->runs = (GSList *)(*env)->GetIntLongField(env, lpObject, PangoLayoutLineFc.runs);
 	return lpStruct;
 }
 
 void setPangoLayoutLineFields(JNIEnv *env, jobject lpObject, PangoLayoutLine *lpStruct)
 {
 	if (!PangoLayoutLineFc.cached) cachePangoLayoutLineFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, PangoLayoutLineFc.layout, (jint)lpStruct->layout);
+	(*env)->SetIntLongField(env, lpObject, PangoLayoutLineFc.layout, (jintLong)lpStruct->layout);
 	(*env)->SetIntField(env, lpObject, PangoLayoutLineFc.start_index, (jint)lpStruct->start_index);
 	(*env)->SetIntField(env, lpObject, PangoLayoutLineFc.length, (jint)lpStruct->length);
-	(*env)->SetIntField(env, lpObject, PangoLayoutLineFc.runs, (jint)lpStruct->runs);
+	(*env)->SetIntLongField(env, lpObject, PangoLayoutLineFc.runs, (jintLong)lpStruct->runs);
 }
 #endif
 
@@ -2209,24 +2209,24 @@ void cachePangoLayoutRunFields(JNIEnv *env, jobject lpObject)
 {
 	if (PangoLayoutRunFc.cached) return;
 	PangoLayoutRunFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	PangoLayoutRunFc.item = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "item", "I");
-	PangoLayoutRunFc.glyphs = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "glyphs", "I");
+	PangoLayoutRunFc.item = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "item", I_J);
+	PangoLayoutRunFc.glyphs = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "glyphs", I_J);
 	PangoLayoutRunFc.cached = 1;
 }
 
 PangoLayoutRun *getPangoLayoutRunFields(JNIEnv *env, jobject lpObject, PangoLayoutRun *lpStruct)
 {
 	if (!PangoLayoutRunFc.cached) cachePangoLayoutRunFields(env, lpObject);
-	lpStruct->item = (PangoItem *)(*env)->GetIntField(env, lpObject, PangoLayoutRunFc.item);
-	lpStruct->glyphs = (PangoGlyphString *)(*env)->GetIntField(env, lpObject, PangoLayoutRunFc.glyphs);
+	lpStruct->item = (PangoItem *)(*env)->GetIntLongField(env, lpObject, PangoLayoutRunFc.item);
+	lpStruct->glyphs = (PangoGlyphString *)(*env)->GetIntLongField(env, lpObject, PangoLayoutRunFc.glyphs);
 	return lpStruct;
 }
 
 void setPangoLayoutRunFields(JNIEnv *env, jobject lpObject, PangoLayoutRun *lpStruct)
 {
 	if (!PangoLayoutRunFc.cached) cachePangoLayoutRunFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, PangoLayoutRunFc.item, (jint)lpStruct->item);
-	(*env)->SetIntField(env, lpObject, PangoLayoutRunFc.glyphs, (jint)lpStruct->glyphs);
+	(*env)->SetIntLongField(env, lpObject, PangoLayoutRunFc.item, (jintLong)lpStruct->item);
+	(*env)->SetIntLongField(env, lpObject, PangoLayoutRunFc.glyphs, (jintLong)lpStruct->glyphs);
 }
 #endif
 
@@ -2342,10 +2342,10 @@ void cacheXAnyEventFields(JNIEnv *env, jobject lpObject)
 	if (XAnyEventFc.cached) return;
 	cacheXEventFields(env, lpObject);
 	XAnyEventFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	XAnyEventFc.serial = (*env)->GetFieldID(env, XAnyEventFc.clazz, "serial", "I");
+	XAnyEventFc.serial = (*env)->GetFieldID(env, XAnyEventFc.clazz, "serial", I_J);
 	XAnyEventFc.send_event = (*env)->GetFieldID(env, XAnyEventFc.clazz, "send_event", "I");
-	XAnyEventFc.display = (*env)->GetFieldID(env, XAnyEventFc.clazz, "display", "I");
-	XAnyEventFc.window = (*env)->GetFieldID(env, XAnyEventFc.clazz, "window", "I");
+	XAnyEventFc.display = (*env)->GetFieldID(env, XAnyEventFc.clazz, "display", I_J);
+	XAnyEventFc.window = (*env)->GetFieldID(env, XAnyEventFc.clazz, "window", I_J);
 	XAnyEventFc.cached = 1;
 }
 
@@ -2353,10 +2353,10 @@ XAnyEvent *getXAnyEventFields(JNIEnv *env, jobject lpObject, XAnyEvent *lpStruct
 {
 	if (!XAnyEventFc.cached) cacheXAnyEventFields(env, lpObject);
 	getXEventFields(env, lpObject, (XEvent *)lpStruct);
-	lpStruct->serial = (*env)->GetIntField(env, lpObject, XAnyEventFc.serial);
+	lpStruct->serial = (*env)->GetIntLongField(env, lpObject, XAnyEventFc.serial);
 	lpStruct->send_event = (*env)->GetIntField(env, lpObject, XAnyEventFc.send_event);
-	lpStruct->display = (Display *)(*env)->GetIntField(env, lpObject, XAnyEventFc.display);
-	lpStruct->window = (Window)(*env)->GetIntField(env, lpObject, XAnyEventFc.window);
+	lpStruct->display = (Display *)(*env)->GetIntLongField(env, lpObject, XAnyEventFc.display);
+	lpStruct->window = (Window)(*env)->GetIntLongField(env, lpObject, XAnyEventFc.window);
 	return lpStruct;
 }
 
@@ -2364,10 +2364,10 @@ void setXAnyEventFields(JNIEnv *env, jobject lpObject, XAnyEvent *lpStruct)
 {
 	if (!XAnyEventFc.cached) cacheXAnyEventFields(env, lpObject);
 	setXEventFields(env, lpObject, (XEvent *)lpStruct);
-	(*env)->SetIntField(env, lpObject, XAnyEventFc.serial, (jint)lpStruct->serial);
+	(*env)->SetIntLongField(env, lpObject, XAnyEventFc.serial, (jintLong)lpStruct->serial);
 	(*env)->SetIntField(env, lpObject, XAnyEventFc.send_event, (jint)lpStruct->send_event);
-	(*env)->SetIntField(env, lpObject, XAnyEventFc.display, (jint)lpStruct->display);
-	(*env)->SetIntField(env, lpObject, XAnyEventFc.window, (jint)lpStruct->window);
+	(*env)->SetIntLongField(env, lpObject, XAnyEventFc.display, (jintLong)lpStruct->display);
+	(*env)->SetIntLongField(env, lpObject, XAnyEventFc.window, (jintLong)lpStruct->window);
 }
 #endif
 
@@ -2446,13 +2446,13 @@ void cacheXClientMessageEventFields(JNIEnv *env, jobject lpObject)
 	if (XClientMessageEventFc.cached) return;
 	XClientMessageEventFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	XClientMessageEventFc.type = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "type", "I");
-	XClientMessageEventFc.serial = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "serial", "I");
+	XClientMessageEventFc.serial = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "serial", I_J);
 	XClientMessageEventFc.send_event = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "send_event", "Z");
-	XClientMessageEventFc.display = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "display", "I");
-	XClientMessageEventFc.window = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "window", "I");
-	XClientMessageEventFc.message_type = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "message_type", "I");
+	XClientMessageEventFc.display = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "display", I_J);
+	XClientMessageEventFc.window = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "window", I_J);
+	XClientMessageEventFc.message_type = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "message_type", I_J);
 	XClientMessageEventFc.format = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "format", "I");
-	XClientMessageEventFc.data = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "data", "[I");
+	XClientMessageEventFc.data = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "data", I_JArray);
 	XClientMessageEventFc.cached = 1;
 }
 
@@ -2460,15 +2460,15 @@ XClientMessageEvent *getXClientMessageEventFields(JNIEnv *env, jobject lpObject,
 {
 	if (!XClientMessageEventFc.cached) cacheXClientMessageEventFields(env, lpObject);
 	lpStruct->type = (*env)->GetIntField(env, lpObject, XClientMessageEventFc.type);
-	lpStruct->serial = (*env)->GetIntField(env, lpObject, XClientMessageEventFc.serial);
+	lpStruct->serial = (*env)->GetIntLongField(env, lpObject, XClientMessageEventFc.serial);
 	lpStruct->send_event = (*env)->GetBooleanField(env, lpObject, XClientMessageEventFc.send_event);
-	lpStruct->display = (Display *)(*env)->GetIntField(env, lpObject, XClientMessageEventFc.display);
-	lpStruct->window = (Window)(*env)->GetIntField(env, lpObject, XClientMessageEventFc.window);
-	lpStruct->message_type = (Atom)(*env)->GetIntField(env, lpObject, XClientMessageEventFc.message_type);
+	lpStruct->display = (Display *)(*env)->GetIntLongField(env, lpObject, XClientMessageEventFc.display);
+	lpStruct->window = (Window)(*env)->GetIntLongField(env, lpObject, XClientMessageEventFc.window);
+	lpStruct->message_type = (Atom)(*env)->GetIntLongField(env, lpObject, XClientMessageEventFc.message_type);
 	lpStruct->format = (*env)->GetIntField(env, lpObject, XClientMessageEventFc.format);
 	{
-	jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
-	(*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / 4, (jint *)lpStruct->data.l);
+	jintLongArray lpObject1 = (jintLongArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
+	(*env)->GetIntLongArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / sizeof(jintLong), (jintLong *)lpStruct->data.l);
 	}
 	return lpStruct;
 }
@@ -2477,15 +2477,15 @@ void setXClientMessageEventFields(JNIEnv *env, jobject lpObject, XClientMessageE
 {
 	if (!XClientMessageEventFc.cached) cacheXClientMessageEventFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, XClientMessageEventFc.type, (jint)lpStruct->type);
-	(*env)->SetIntField(env, lpObject, XClientMessageEventFc.serial, (jint)lpStruct->serial);
+	(*env)->SetIntLongField(env, lpObject, XClientMessageEventFc.serial, (jintLong)lpStruct->serial);
 	(*env)->SetBooleanField(env, lpObject, XClientMessageEventFc.send_event, (jboolean)lpStruct->send_event);
-	(*env)->SetIntField(env, lpObject, XClientMessageEventFc.display, (jint)lpStruct->display);
-	(*env)->SetIntField(env, lpObject, XClientMessageEventFc.window, (jint)lpStruct->window);
-	(*env)->SetIntField(env, lpObject, XClientMessageEventFc.message_type, (jint)lpStruct->message_type);
+	(*env)->SetIntLongField(env, lpObject, XClientMessageEventFc.display, (jintLong)lpStruct->display);
+	(*env)->SetIntLongField(env, lpObject, XClientMessageEventFc.window, (jintLong)lpStruct->window);
+	(*env)->SetIntLongField(env, lpObject, XClientMessageEventFc.message_type, (jintLong)lpStruct->message_type);
 	(*env)->SetIntField(env, lpObject, XClientMessageEventFc.format, (jint)lpStruct->format);
 	{
-	jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
-	(*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / 4, (jint *)lpStruct->data.l);
+	jintLongArray lpObject1 = (jintLongArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
+	(*env)->SetIntLongArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / sizeof(jintLong), (jintLong *)lpStruct->data.l);
 	}
 }
 #endif
@@ -2504,8 +2504,8 @@ void cacheXCrossingEventFields(JNIEnv *env, jobject lpObject)
 	if (XCrossingEventFc.cached) return;
 	cacheXAnyEventFields(env, lpObject);
 	XCrossingEventFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	XCrossingEventFc.root = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "root", "I");
-	XCrossingEventFc.subwindow = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "subwindow", "I");
+	XCrossingEventFc.root = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "root", I_J);
+	XCrossingEventFc.subwindow = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "subwindow", I_J);
 	XCrossingEventFc.time = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "time", "I");
 	XCrossingEventFc.x = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "x", "I");
 	XCrossingEventFc.y = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "y", "I");
@@ -2523,8 +2523,8 @@ XCrossingEvent *getXCrossingEventFields(JNIEnv *env, jobject lpObject, XCrossing
 {
 	if (!XCrossingEventFc.cached) cacheXCrossingEventFields(env, lpObject);
 	getXAnyEventFields(env, lpObject, (XAnyEvent *)lpStruct);
-	lpStruct->root = (Window)(*env)->GetIntField(env, lpObject, XCrossingEventFc.root);
-	lpStruct->subwindow = (Window)(*env)->GetIntField(env, lpObject, XCrossingEventFc.subwindow);
+	lpStruct->root = (Window)(*env)->GetIntLongField(env, lpObject, XCrossingEventFc.root);
+	lpStruct->subwindow = (Window)(*env)->GetIntLongField(env, lpObject, XCrossingEventFc.subwindow);
 	lpStruct->time = (Time)(*env)->GetIntField(env, lpObject, XCrossingEventFc.time);
 	lpStruct->x = (*env)->GetIntField(env, lpObject, XCrossingEventFc.x);
 	lpStruct->y = (*env)->GetIntField(env, lpObject, XCrossingEventFc.y);
@@ -2542,8 +2542,8 @@ void setXCrossingEventFields(JNIEnv *env, jobject lpObject, XCrossingEvent *lpSt
 {
 	if (!XCrossingEventFc.cached) cacheXCrossingEventFields(env, lpObject);
 	setXAnyEventFields(env, lpObject, (XAnyEvent *)lpStruct);
-	(*env)->SetIntField(env, lpObject, XCrossingEventFc.root, (jint)lpStruct->root);
-	(*env)->SetIntField(env, lpObject, XCrossingEventFc.subwindow, (jint)lpStruct->subwindow);
+	(*env)->SetIntLongField(env, lpObject, XCrossingEventFc.root, (jintLong)lpStruct->root);
+	(*env)->SetIntLongField(env, lpObject, XCrossingEventFc.subwindow, (jintLong)lpStruct->subwindow);
 	(*env)->SetIntField(env, lpObject, XCrossingEventFc.time, (jint)lpStruct->time);
 	(*env)->SetIntField(env, lpObject, XCrossingEventFc.x, (jint)lpStruct->x);
 	(*env)->SetIntField(env, lpObject, XCrossingEventFc.y, (jint)lpStruct->y);
@@ -2685,17 +2685,17 @@ void cacheXRenderPictureAttributesFields(JNIEnv *env, jobject lpObject)
 	if (XRenderPictureAttributesFc.cached) return;
 	XRenderPictureAttributesFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	XRenderPictureAttributesFc.repeat = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "repeat", "Z");
-	XRenderPictureAttributesFc.alpha_map = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_map", "I");
+	XRenderPictureAttributesFc.alpha_map = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_map", I_J);
 	XRenderPictureAttributesFc.alpha_x_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_x_origin", "I");
 	XRenderPictureAttributesFc.alpha_y_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_y_origin", "I");
 	XRenderPictureAttributesFc.clip_x_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_x_origin", "I");
 	XRenderPictureAttributesFc.clip_y_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_y_origin", "I");
-	XRenderPictureAttributesFc.clip_mask = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_mask", "I");
+	XRenderPictureAttributesFc.clip_mask = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_mask", I_J);
 	XRenderPictureAttributesFc.graphics_exposures = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "graphics_exposures", "Z");
 	XRenderPictureAttributesFc.subwindow_mode = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "subwindow_mode", "I");
 	XRenderPictureAttributesFc.poly_edge = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "poly_edge", "I");
 	XRenderPictureAttributesFc.poly_mode = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "poly_mode", "I");
-	XRenderPictureAttributesFc.dither = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "dither", "I");
+	XRenderPictureAttributesFc.dither = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "dither", I_J);
 	XRenderPictureAttributesFc.component_alpha = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "component_alpha", "Z");
 	XRenderPictureAttributesFc.cached = 1;
 }
@@ -2704,17 +2704,17 @@ XRenderPictureAttributes *getXRenderPictureAttributesFields(JNIEnv *env, jobject
 {
 	if (!XRenderPictureAttributesFc.cached) cacheXRenderPictureAttributesFields(env, lpObject);
 	lpStruct->repeat = (*env)->GetBooleanField(env, lpObject, XRenderPictureAttributesFc.repeat);
-	lpStruct->alpha_map = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_map);
+	lpStruct->alpha_map = (*env)->GetIntLongField(env, lpObject, XRenderPictureAttributesFc.alpha_map);
 	lpStruct->alpha_x_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_x_origin);
 	lpStruct->alpha_y_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_y_origin);
 	lpStruct->clip_x_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.clip_x_origin);
 	lpStruct->clip_y_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.clip_y_origin);
-	lpStruct->clip_mask = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.clip_mask);
+	lpStruct->clip_mask = (*env)->GetIntLongField(env, lpObject, XRenderPictureAttributesFc.clip_mask);
 	lpStruct->graphics_exposures = (*env)->GetBooleanField(env, lpObject, XRenderPictureAttributesFc.graphics_exposures);
 	lpStruct->subwindow_mode = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.subwindow_mode);
 	lpStruct->poly_edge = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.poly_edge);
 	lpStruct->poly_mode = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.poly_mode);
-	lpStruct->dither = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.dither);
+	lpStruct->dither = (*env)->GetIntLongField(env, lpObject, XRenderPictureAttributesFc.dither);
 	lpStruct->component_alpha = (*env)->GetBooleanField(env, lpObject, XRenderPictureAttributesFc.component_alpha);
 	return lpStruct;
 }
@@ -2723,17 +2723,17 @@ void setXRenderPictureAttributesFields(JNIEnv *env, jobject lpObject, XRenderPic
 {
 	if (!XRenderPictureAttributesFc.cached) cacheXRenderPictureAttributesFields(env, lpObject);
 	(*env)->SetBooleanField(env, lpObject, XRenderPictureAttributesFc.repeat, (jboolean)lpStruct->repeat);
-	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_map, (jint)lpStruct->alpha_map);
+	(*env)->SetIntLongField(env, lpObject, XRenderPictureAttributesFc.alpha_map, (jintLong)lpStruct->alpha_map);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_x_origin, (jint)lpStruct->alpha_x_origin);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_y_origin, (jint)lpStruct->alpha_y_origin);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.clip_x_origin, (jint)lpStruct->clip_x_origin);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.clip_y_origin, (jint)lpStruct->clip_y_origin);
-	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.clip_mask, (jint)lpStruct->clip_mask);
+	(*env)->SetIntLongField(env, lpObject, XRenderPictureAttributesFc.clip_mask, (jintLong)lpStruct->clip_mask);
 	(*env)->SetBooleanField(env, lpObject, XRenderPictureAttributesFc.graphics_exposures, (jboolean)lpStruct->graphics_exposures);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.subwindow_mode, (jint)lpStruct->subwindow_mode);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.poly_edge, (jint)lpStruct->poly_edge);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.poly_mode, (jint)lpStruct->poly_mode);
-	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.dither, (jint)lpStruct->dither);
+	(*env)->SetIntLongField(env, lpObject, XRenderPictureAttributesFc.dither, (jintLong)lpStruct->dither);
 	(*env)->SetBooleanField(env, lpObject, XRenderPictureAttributesFc.component_alpha, (jboolean)lpStruct->component_alpha);
 }
 #endif
@@ -2790,7 +2790,7 @@ void cacheXWindowChangesFields(JNIEnv *env, jobject lpObject)
 	XWindowChangesFc.width = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "width", "I");
 	XWindowChangesFc.height = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "height", "I");
 	XWindowChangesFc.border_width = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "border_width", "I");
-	XWindowChangesFc.sibling = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "sibling", "I");
+	XWindowChangesFc.sibling = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "sibling", I_J);
 	XWindowChangesFc.stack_mode = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "stack_mode", "I");
 	XWindowChangesFc.cached = 1;
 }
@@ -2803,7 +2803,7 @@ XWindowChanges *getXWindowChangesFields(JNIEnv *env, jobject lpObject, XWindowCh
 	lpStruct->width = (*env)->GetIntField(env, lpObject, XWindowChangesFc.width);
 	lpStruct->height = (*env)->GetIntField(env, lpObject, XWindowChangesFc.height);
 	lpStruct->border_width = (*env)->GetIntField(env, lpObject, XWindowChangesFc.border_width);
-	lpStruct->sibling = (*env)->GetIntField(env, lpObject, XWindowChangesFc.sibling);
+	lpStruct->sibling = (*env)->GetIntLongField(env, lpObject, XWindowChangesFc.sibling);
 	lpStruct->stack_mode = (*env)->GetIntField(env, lpObject, XWindowChangesFc.stack_mode);
 	return lpStruct;
 }
@@ -2816,7 +2816,7 @@ void setXWindowChangesFields(JNIEnv *env, jobject lpObject, XWindowChanges *lpSt
 	(*env)->SetIntField(env, lpObject, XWindowChangesFc.width, (jint)lpStruct->width);
 	(*env)->SetIntField(env, lpObject, XWindowChangesFc.height, (jint)lpStruct->height);
 	(*env)->SetIntField(env, lpObject, XWindowChangesFc.border_width, (jint)lpStruct->border_width);
-	(*env)->SetIntField(env, lpObject, XWindowChangesFc.sibling, (jint)lpStruct->sibling);
+	(*env)->SetIntLongField(env, lpObject, XWindowChangesFc.sibling, (jintLong)lpStruct->sibling);
 	(*env)->SetIntField(env, lpObject, XWindowChangesFc.stack_mode, (jint)lpStruct->stack_mode);
 }
 #endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c
index 5ba381e12c..8e5d93c0a7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c
@@ -1455,24 +1455,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRectInRegion)
 
 #ifndef NO__1XRenderComposite
 JNIEXPORT void JNICALL OS_NATIVE(_1XRenderComposite)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
 {
 	OS_NATIVE_ENTER(env, that, _1XRenderComposite_FUNC);
 /*
 	XRenderComposite(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderComposite_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderComposite");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
+		LOAD_FUNCTION(fp, XRenderComposite)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong, jintLong, jint, jint, jint, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1XRenderComposite_FUNC);
@@ -1480,29 +1472,20 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderComposite)
 #endif
 
 #ifndef NO__1XRenderCreatePicture
-JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderCreatePicture)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderCreatePicture)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4)
 {
 	XRenderPictureAttributes _arg4, *lparg4=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XRenderCreatePicture_FUNC);
 	if (arg4) if ((lparg4 = getXRenderPictureAttributesFields(env, arg4, &_arg4)) == NULL) goto fail;
 /*
-	rc = (jint)XRenderCreatePicture(arg0, arg1, arg2, arg3, lparg4);
+	rc = (jintLong)XRenderCreatePicture(arg0, arg1, arg2, arg3, lparg4);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, jint, jint, jint, XRenderPictureAttributes *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderCreatePicture_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderCreatePicture");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1, arg2, arg3, lparg4);
+		LOAD_FUNCTION(fp, XRenderCreatePicture)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, XRenderPictureAttributes *))fp)(arg0, arg1, arg2, arg3, lparg4);
 		}
 	}
 fail:
@@ -1513,27 +1496,18 @@ fail:
 #endif
 
 #ifndef NO__1XRenderFindStandardFormat
-JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindStandardFormat)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindStandardFormat)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XRenderFindStandardFormat_FUNC);
 /*
-	rc = (jint)XRenderFindStandardFormat(arg0, arg1);
+	rc = (jintLong)XRenderFindStandardFormat(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderFindStandardFormat_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderFindStandardFormat");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, XRenderFindStandardFormat)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1XRenderFindStandardFormat_FUNC);
@@ -1542,27 +1516,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindStandardFormat)
 #endif
 
 #ifndef NO__1XRenderFindVisualFormat
-JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindVisualFormat)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindVisualFormat)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XRenderFindVisualFormat_FUNC);
 /*
-	rc = (jint)XRenderFindVisualFormat(arg0, arg1);
+	rc = (jintLong)XRenderFindVisualFormat(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderFindVisualFormat_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderFindVisualFormat");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, XRenderFindVisualFormat)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1XRenderFindVisualFormat_FUNC);
@@ -1572,24 +1537,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindVisualFormat)
 
 #ifndef NO__1XRenderFreePicture
 JNIEXPORT void JNICALL OS_NATIVE(_1XRenderFreePicture)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1XRenderFreePicture_FUNC);
 /*
 	XRenderFreePicture(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderFreePicture_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderFreePicture");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1);
+		LOAD_FUNCTION(fp, XRenderFreePicture)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1XRenderFreePicture_FUNC);
@@ -1598,7 +1555,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderFreePicture)
 
 #ifndef NO__1XRenderQueryExtension
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1XRenderQueryExtension)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -1610,18 +1567,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XRenderQueryExtension)
 	rc = (jboolean)XRenderQueryExtension(arg0, lparg1, lparg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jboolean (*FPTR)(jint, jint *, jint *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderQueryExtension_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderQueryExtension");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jboolean)(*fptr)(arg0, lparg1, lparg2);
+		LOAD_FUNCTION(fp, XRenderQueryExtension)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2);
 		}
 	}
 fail:
@@ -1634,7 +1582,7 @@ fail:
 
 #ifndef NO__1XRenderQueryVersion
 JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderQueryVersion)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -1646,18 +1594,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderQueryVersion)
 	rc = (jint)XRenderQueryVersion(arg0, lparg1, lparg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(jint, jint *, jint *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderQueryVersion_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderQueryVersion");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)(arg0, lparg1, lparg2);
+		LOAD_FUNCTION(fp, XRenderQueryVersion)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2);
 		}
 	}
 fail:
@@ -1670,7 +1609,7 @@ fail:
 
 #ifndef NO__1XRenderSetPictureClipRectangles
 JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRectangles)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jshortArray arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jshortArray arg4, jint arg5)
 {
 	jshort *lparg4=NULL;
 	OS_NATIVE_ENTER(env, that, _1XRenderSetPictureClipRectangles_FUNC);
@@ -1679,17 +1618,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRectangles)
 	XRenderSetPictureClipRectangles(arg0, arg1, arg2, arg3, lparg4, arg5);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint, jint, jint, jshort *, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderSetPictureClipRectangles_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderSetPictureClipRectangles");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2, arg3, lparg4, arg5);
+		LOAD_FUNCTION(fp, XRenderSetPictureClipRectangles)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jshort *, jint))fp)(arg0, arg1, arg2, arg3, lparg4, arg5);
 		}
 	}
 fail:
@@ -1700,24 +1631,16 @@ fail:
 
 #ifndef NO__1XRenderSetPictureClipRegion
 JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRegion)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1XRenderSetPictureClipRegion_FUNC);
 /*
 	XRenderSetPictureClipRegion(arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint, jint);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderSetPictureClipRegion_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderSetPictureClipRegion");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, arg2);
+		LOAD_FUNCTION(fp, XRenderSetPictureClipRegion)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1XRenderSetPictureClipRegion_FUNC);
@@ -1726,7 +1649,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRegion)
 
 #ifndef NO__1XRenderSetPictureTransform
 JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureTransform)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1XRenderSetPictureTransform_FUNC);
@@ -1735,17 +1658,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureTransform)
 	XRenderSetPictureTransform(arg0, arg1, lparg2);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef void (*FPTR)(jint, jint, jint *);
-		static FPTR fptr;
-		if (!initialized) {
-			if (!handle) handle = dlopen(XRenderSetPictureTransform_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "XRenderSetPictureTransform");
-			initialized = 1;
-		}
-		if (fptr) {
-			(*fptr)(arg0, arg1, lparg2);
+		LOAD_FUNCTION(fp, XRenderSetPictureTransform)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jint *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
@@ -5573,7 +5488,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1applicationShellWidgetClass)
 
 #ifndef NO__1dlclose
 JNIEXPORT jint JNICALL OS_NATIVE(_1dlclose)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1dlclose_FUNC);
@@ -5584,14 +5499,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1dlclose)
 #endif
 
 #ifndef NO__1dlopen
-JNIEXPORT jint JNICALL OS_NATIVE(_1dlopen)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1dlopen)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1dlopen_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)dlopen((const char *)lparg0, arg1);
+	rc = (jintLong)dlopen((const char *)lparg0, arg1);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1dlopen_FUNC);
@@ -5600,14 +5515,14 @@ fail:
 #endif
 
 #ifndef NO__1dlsym
-JNIEXPORT jint JNICALL OS_NATIVE(_1dlsym)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1dlsym)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1dlsym_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)dlsym((void *)arg0, (const char *)lparg1);
+	rc = (jintLong)dlsym((void *)arg0, (const char *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1dlsym_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_structs.c
index e3544f692b..477e0a7d67 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_structs.c
@@ -242,7 +242,7 @@ XClientMessageEvent *getXClientMessageEventFields(JNIEnv *env, jobject lpObject,
 	lpStruct->format = (*env)->GetIntField(env, lpObject, XClientMessageEventFc.format);
 	{
 	jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
-	(*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / 4, (jint *)lpStruct->data.l);
+	(*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / sizeof(jint), (jint *)lpStruct->data.l);
 	}
 	return lpStruct;
 }
@@ -255,7 +255,7 @@ void setXClientMessageEventFields(JNIEnv *env, jobject lpObject, XClientMessageE
 	(*env)->SetIntField(env, lpObject, XClientMessageEventFc.format, (jint)lpStruct->format);
 	{
 	jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
-	(*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / 4, (jint *)lpStruct->data.l);
+	(*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / sizeof(jint), (jint *)lpStruct->data.l);
 	}
 }
 #endif
@@ -1257,17 +1257,17 @@ void cacheXRenderPictureAttributesFields(JNIEnv *env, jobject lpObject)
 	if (XRenderPictureAttributesFc.cached) return;
 	XRenderPictureAttributesFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	XRenderPictureAttributesFc.repeat = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "repeat", "Z");
-	XRenderPictureAttributesFc.alpha_map = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_map", "I");
+	XRenderPictureAttributesFc.alpha_map = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_map", I_J);
 	XRenderPictureAttributesFc.alpha_x_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_x_origin", "I");
 	XRenderPictureAttributesFc.alpha_y_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_y_origin", "I");
 	XRenderPictureAttributesFc.clip_x_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_x_origin", "I");
 	XRenderPictureAttributesFc.clip_y_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_y_origin", "I");
-	XRenderPictureAttributesFc.clip_mask = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_mask", "I");
+	XRenderPictureAttributesFc.clip_mask = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_mask", I_J);
 	XRenderPictureAttributesFc.graphics_exposures = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "graphics_exposures", "Z");
 	XRenderPictureAttributesFc.subwindow_mode = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "subwindow_mode", "I");
 	XRenderPictureAttributesFc.poly_edge = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "poly_edge", "I");
 	XRenderPictureAttributesFc.poly_mode = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "poly_mode", "I");
-	XRenderPictureAttributesFc.dither = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "dither", "I");
+	XRenderPictureAttributesFc.dither = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "dither", I_J);
 	XRenderPictureAttributesFc.component_alpha = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "component_alpha", "Z");
 	XRenderPictureAttributesFc.cached = 1;
 }
@@ -1276,17 +1276,17 @@ XRenderPictureAttributes *getXRenderPictureAttributesFields(JNIEnv *env, jobject
 {
 	if (!XRenderPictureAttributesFc.cached) cacheXRenderPictureAttributesFields(env, lpObject);
 	lpStruct->repeat = (*env)->GetBooleanField(env, lpObject, XRenderPictureAttributesFc.repeat);
-	lpStruct->alpha_map = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_map);
+	lpStruct->alpha_map = (*env)->GetIntLongField(env, lpObject, XRenderPictureAttributesFc.alpha_map);
 	lpStruct->alpha_x_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_x_origin);
 	lpStruct->alpha_y_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_y_origin);
 	lpStruct->clip_x_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.clip_x_origin);
 	lpStruct->clip_y_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.clip_y_origin);
-	lpStruct->clip_mask = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.clip_mask);
+	lpStruct->clip_mask = (*env)->GetIntLongField(env, lpObject, XRenderPictureAttributesFc.clip_mask);
 	lpStruct->graphics_exposures = (*env)->GetBooleanField(env, lpObject, XRenderPictureAttributesFc.graphics_exposures);
 	lpStruct->subwindow_mode = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.subwindow_mode);
 	lpStruct->poly_edge = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.poly_edge);
 	lpStruct->poly_mode = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.poly_mode);
-	lpStruct->dither = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.dither);
+	lpStruct->dither = (*env)->GetIntLongField(env, lpObject, XRenderPictureAttributesFc.dither);
 	lpStruct->component_alpha = (*env)->GetBooleanField(env, lpObject, XRenderPictureAttributesFc.component_alpha);
 	return lpStruct;
 }
@@ -1295,17 +1295,17 @@ void setXRenderPictureAttributesFields(JNIEnv *env, jobject lpObject, XRenderPic
 {
 	if (!XRenderPictureAttributesFc.cached) cacheXRenderPictureAttributesFields(env, lpObject);
 	(*env)->SetBooleanField(env, lpObject, XRenderPictureAttributesFc.repeat, (jboolean)lpStruct->repeat);
-	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_map, (jint)lpStruct->alpha_map);
+	(*env)->SetIntLongField(env, lpObject, XRenderPictureAttributesFc.alpha_map, (jintLong)lpStruct->alpha_map);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_x_origin, (jint)lpStruct->alpha_x_origin);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_y_origin, (jint)lpStruct->alpha_y_origin);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.clip_x_origin, (jint)lpStruct->clip_x_origin);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.clip_y_origin, (jint)lpStruct->clip_y_origin);
-	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.clip_mask, (jint)lpStruct->clip_mask);
+	(*env)->SetIntLongField(env, lpObject, XRenderPictureAttributesFc.clip_mask, (jintLong)lpStruct->clip_mask);
 	(*env)->SetBooleanField(env, lpObject, XRenderPictureAttributesFc.graphics_exposures, (jboolean)lpStruct->graphics_exposures);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.subwindow_mode, (jint)lpStruct->subwindow_mode);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.poly_edge, (jint)lpStruct->poly_edge);
 	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.poly_mode, (jint)lpStruct->poly_mode);
-	(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.dither, (jint)lpStruct->dither);
+	(*env)->SetIntLongField(env, lpObject, XRenderPictureAttributesFc.dither, (jintLong)lpStruct->dither);
 	(*env)->SetBooleanField(env, lpObject, XRenderPictureAttributesFc.component_alpha, (jboolean)lpStruct->component_alpha);
 }
 #endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.c
index 8957fab8f1..2a3e354eb1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_stats.c
index 55aa078b77..02d502d1fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_stats.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_stats.h
index e391e62bfd..9e0f38310a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_stats.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.c
index 3d43e007f1..02df325420 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -218,7 +218,7 @@ PgDisplaySettings_t *getPgDisplaySettings_tFields(JNIEnv *env, jobject lpObject,
 	lpStruct->flags = (*env)->GetIntField(env, lpObject, PgDisplaySettings_tFc.flags);
 	{
 	jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, PgDisplaySettings_tFc.reserved);
-	(*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->reserved) / 4, (jint *)lpStruct->reserved);
+	(*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->reserved) / sizeof(jint), (jint *)lpStruct->reserved);
 	}
 	return lpStruct;
 }
@@ -233,7 +233,7 @@ void setPgDisplaySettings_tFields(JNIEnv *env, jobject lpObject, PgDisplaySettin
 	(*env)->SetIntField(env, lpObject, PgDisplaySettings_tFc.flags, (jint)lpStruct->flags);
 	{
 	jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, PgDisplaySettings_tFc.reserved);
-	(*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->reserved) / 4, (jint *)lpStruct->reserved);
+	(*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->reserved) / sizeof(jint), (jint *)lpStruct->reserved);
 	}
 }
 #endif
@@ -1349,7 +1349,7 @@ PtFileSelectionInfo_t *getPtFileSelectionInfo_tFields(JNIEnv *env, jobject lpObj
 	lpStruct->minfo = (PtFileSelectorInfo_t *)(*env)->GetIntField(env, lpObject, PtFileSelectionInfo_tFc.minfo);
 	{
 	jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, PtFileSelectionInfo_tFc.spare);
-	(*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->spare) / 4, (jint *)lpStruct->spare);
+	(*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->spare) / sizeof(jint), (jint *)lpStruct->spare);
 	}
 	return lpStruct;
 }
@@ -1389,7 +1389,7 @@ void setPtFileSelectionInfo_tFields(JNIEnv *env, jobject lpObject, PtFileSelecti
 	(*env)->SetIntField(env, lpObject, PtFileSelectionInfo_tFc.minfo, (jint)lpStruct->minfo);
 	{
 	jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, PtFileSelectionInfo_tFc.spare);
-	(*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->spare) / 4, (jint *)lpStruct->spare);
+	(*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->spare) / sizeof(jint), (jint *)lpStruct->spare);
 	}
 }
 #endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.h
index edf1190f13..5c8003681f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
index 2f2286e3f1..e93e3c4863 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
@@ -37,7 +37,7 @@ IF x.%MSSDK%==x. set MSSDK="%SWT_BUILDDIR%\MSSDKs\Microsoft Platform SDK for Win
 call %MSSDK%\setenv /X64 /RETAIL
 IF x.%OUTPUT_DIR%==x. set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86_64
 IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-sdk50-x86_64
-set CFLAGS=-DSWT_PTR_SIZE_64
+set CFLAGS=-DJNI64
 shift
 GOTO MAKE
 
@@ -47,7 +47,7 @@ IF x.%MSSDK%==x. set MSSDK="%SWT_BUILDDIR%\MSSDKs\Microsoft Platform SDK for Win
 call %MSSDK%\setenv /SRV64 /RETAIL
 IF x.%OUTPUT_DIR%==x. set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.ia64
 IF x.%JAVA_HOME%==x. set JAVA_HOME=%SWT_BUILDDIR%\ibm-sdk142-ia64
-set CFLAGS=-DSWT_PTR_SIZE_64
+set CFLAGS=-DJNI64
 shift
 GOTO MAKE
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.xml b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.xml
index 8b91f4381e..cb8d4355ac 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.xml
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.xml
@@ -78,6 +78,10 @@
 	<antcall target="build_win32_dll"/>
 	<antcall target="clean"/>
 	<antcall target="build_wince_dll"/>
+	<antcall target="clean"/>
+	<antcall target="build_win32_x86_64_dll"/>
+	<antcall target="clean"/>
+	<antcall target="build_win32_ia64_dll"/>
 </target>
 
 <target name="clean">
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
index 03067ca4b3..e32dd7d4a3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com.c
@@ -17,33 +17,25 @@
 
 #ifndef NO_AccessibleObjectFromWindow
 JNIEXPORT jint JNICALL COM_NATIVE(AccessibleObjectFromWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2, jintLongArray arg3)
 {
 	GUID _arg2, *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, AccessibleObjectFromWindow_FUNC);
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	rc = (jint)AccessibleObjectFromWindow((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AccessibleObjectFromWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "AccessibleObjectFromWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AccessibleObjectFromWindow)
 		if (fp) {
-			rc = (jint)fp((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HWND, DWORD, GUID *, LPVOID *))fp)((HWND)arg0, (DWORD)arg1, lparg2, (LPVOID *)lparg3);
 		}
 	}
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
 	COM_NATIVE_EXIT(env, that, AccessibleObjectFromWindow_FUNC);
 	return rc;
@@ -126,19 +118,19 @@ JNIEXPORT jint JNICALL COM_NATIVE(COSERVERINFO_1sizeof)
 
 #ifndef NO_CoCreateInstance
 JNIEXPORT jint JNICALL COM_NATIVE(CoCreateInstance)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jobject arg3, jintLongArray arg4)
 {
 	GUID _arg0, *lparg0=NULL;
 	GUID _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, CoCreateInstance_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)CoCreateInstance(lparg0, (LPUNKNOWN)arg1, arg2, lparg3, (LPVOID *)lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0);
 	COM_NATIVE_EXIT(env, that, CoCreateInstance_FUNC);
@@ -158,19 +150,19 @@ JNIEXPORT void JNICALL COM_NATIVE(CoFreeUnusedLibraries)
 
 #ifndef NO_CoGetClassObject
 JNIEXPORT jint JNICALL COM_NATIVE(CoGetClassObject)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jintLong arg2, jobject arg3, jintLongArray arg4)
 {
 	GUID _arg0, *lparg0=NULL;
 	GUID _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, CoGetClassObject_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)CoGetClassObject(lparg0, arg1, (COSERVERINFO *)arg2, lparg3, (LPVOID *)lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0);
 	COM_NATIVE_EXIT(env, that, CoGetClassObject_FUNC);
@@ -180,7 +172,7 @@ fail:
 
 #ifndef NO_CoLockObjectExternal
 JNIEXPORT jint JNICALL COM_NATIVE(CoLockObjectExternal)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jboolean arg2)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, CoLockObjectExternal_FUNC);
@@ -191,12 +183,12 @@ JNIEXPORT jint JNICALL COM_NATIVE(CoLockObjectExternal)
 #endif
 
 #ifndef NO_CoTaskMemAlloc
-JNIEXPORT jint JNICALL COM_NATIVE(CoTaskMemAlloc)
+JNIEXPORT jintLong JNICALL COM_NATIVE(CoTaskMemAlloc)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	COM_NATIVE_ENTER(env, that, CoTaskMemAlloc_FUNC);
-	rc = (jint)CoTaskMemAlloc((ULONG)arg0);
+	rc = (jintLong)CoTaskMemAlloc((ULONG)arg0);
 	COM_NATIVE_EXIT(env, that, CoTaskMemAlloc_FUNC);
 	return rc;
 }
@@ -204,7 +196,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(CoTaskMemAlloc)
 
 #ifndef NO_CoTaskMemFree
 JNIEXPORT void JNICALL COM_NATIVE(CoTaskMemFree)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	COM_NATIVE_ENTER(env, that, CoTaskMemFree_FUNC);
 	CoTaskMemFree((LPVOID)arg0);
@@ -214,33 +206,25 @@ JNIEXPORT void JNICALL COM_NATIVE(CoTaskMemFree)
 
 #ifndef NO_CreateStdAccessibleObject
 JNIEXPORT jint JNICALL COM_NATIVE(CreateStdAccessibleObject)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2, jintLongArray arg3)
 {
 	GUID _arg2, *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, CreateStdAccessibleObject_FUNC);
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	rc = (jint)CreateStdAccessibleObject((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(CreateStdAccessibleObject_LIB);
-			if (hm) fp = GetProcAddress(hm, "CreateStdAccessibleObject");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, CreateStdAccessibleObject)
 		if (fp) {
-			rc = (jint)fp((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HWND, jint, GUID *, LPVOID *))fp)((HWND)arg0, arg1, lparg2, (LPVOID *)lparg3);
 		}
 	}
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
 	COM_NATIVE_EXIT(env, that, CreateStdAccessibleObject_FUNC);
 	return rc;
@@ -273,7 +257,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(DVTARGETDEVICE_1sizeof)
 
 #ifndef NO_DoDragDrop
 JNIEXPORT jint JNICALL COM_NATIVE(DoDragDrop)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jint rc = 0;
@@ -417,28 +401,20 @@ JNIEXPORT jint JNICALL COM_NATIVE(LICINFO_1sizeof)
 #endif
 
 #ifndef NO_LresultFromObject
-JNIEXPORT jint JNICALL COM_NATIVE(LresultFromObject)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL COM_NATIVE(LresultFromObject)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
 {
 	GUID _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	COM_NATIVE_ENTER(env, that, LresultFromObject_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail;
 /*
-	rc = (jint)LresultFromObject(lparg0, arg1, (LPUNKNOWN)arg2);
+	rc = (jintLong)LresultFromObject(lparg0, arg1, (LPUNKNOWN)arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(LresultFromObject_LIB);
-			if (hm) fp = GetProcAddress(hm, "LresultFromObject");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, LresultFromObject)
 		if (fp) {
-			rc = (jint)fp(lparg0, arg1, (LPUNKNOWN)arg2);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GUID *, jintLong, LPUNKNOWN))fp)(lparg0, arg1, (LPUNKNOWN)arg2);
 		}
 	}
 fail:
@@ -448,208 +424,373 @@ fail:
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	FORMATETC _arg1, *lparg1=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getFORMATETCFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	GUID _arg1, *lparg1=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getGUIDFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	OLEINPLACEFRAMEINFO _arg1, *lparg1=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getOLEINPLACEFRAMEINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	STATSTG _arg1, *lparg1=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getSTATSTGFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	STGMEDIUM _arg1, *lparg1=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getSTGMEDIUMFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	DISPPARAMS _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setDISPPARAMSFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	FORMATETC _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setFORMATETCFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	FUNCDESC _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setFUNCDESCFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	GUID _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	STATSTG _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setSTATSTGFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	STGMEDIUM _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setSTGMEDIUMFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	TYPEATTR _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setTYPEATTRFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	VARDESC _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setVARDESCFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	VARIANT _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setVARIANTFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II
-JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL COM_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	RECT _arg0, *lparg0=NULL;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setRECTFields(env, arg0, lparg0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI_FUNC);
+#endif
 }
 #endif
 
@@ -679,21 +820,21 @@ JNIEXPORT jint JNICALL COM_NATIVE(OLEINPLACEFRAMEINFO_1sizeof)
 
 #ifndef NO_OleCreate
 JNIEXPORT jint JNICALL COM_NATIVE(OleCreate)
-	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jintArray arg6)
+	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jobject arg3, jintLong arg4, jintLong arg5, jintLongArray arg6)
 {
 	GUID _arg0, *lparg0=NULL;
 	GUID _arg1, *lparg1=NULL;
 	FORMATETC _arg3, *lparg3=NULL;
-	jint *lparg6=NULL;
+	jintLong *lparg6=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleCreate_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getGUIDFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getFORMATETCFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	rc = (jint)OleCreate(lparg0, lparg1, arg2, lparg3, (IOleClientSite *)arg4, (IStorage *)arg5, (void **)lparg6);
 fail:
-	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
+	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
 	if (arg3 && lparg3) setFORMATETCFields(env, arg3, lparg3);
 	if (arg1 && lparg1) setGUIDFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0);
@@ -704,23 +845,23 @@ fail:
 
 #ifndef NO_OleCreateFromFile
 JNIEXPORT jint JNICALL COM_NATIVE(OleCreateFromFile)
-	(JNIEnv *env, jclass that, jobject arg0, jcharArray arg1, jobject arg2, jint arg3, jobject arg4, jint arg5, jint arg6, jintArray arg7)
+	(JNIEnv *env, jclass that, jobject arg0, jcharArray arg1, jobject arg2, jint arg3, jobject arg4, jintLong arg5, jintLong arg6, jintLongArray arg7)
 {
 	GUID _arg0, *lparg0=NULL;
 	jchar *lparg1=NULL;
 	GUID _arg2, *lparg2=NULL;
 	FORMATETC _arg4, *lparg4=NULL;
-	jint *lparg7=NULL;
+	jintLong *lparg7=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleCreateFromFile_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getFORMATETCFields(env, arg4, &_arg4)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
 	rc = (jint)OleCreateFromFile(lparg0, (LPCOLESTR)lparg1, lparg2, arg3, lparg4, (LPOLECLIENTSITE)arg5, (LPSTORAGE)arg6, (LPVOID *)lparg7);
 fail:
-	if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
+	if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0);
 	if (arg4 && lparg4) setFORMATETCFields(env, arg4, lparg4);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
@@ -732,17 +873,17 @@ fail:
 
 #ifndef NO_OleCreatePropertyFrame
 JNIEXPORT jint JNICALL COM_NATIVE(OleCreatePropertyFrame)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4, jintArray arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4, jintLongArray arg5, jint arg6, jintLong arg7, jint arg8, jint arg9, jintLong arg10)
 {
 	jchar *lparg3=NULL;
-	jint *lparg5=NULL;
+	jintLong *lparg5=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleCreatePropertyFrame_FUNC);
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	rc = (jint)OleCreatePropertyFrame((HWND)arg0, arg1, arg2, (LPCOLESTR)lparg3, arg4, (LPUNKNOWN FAR*)lparg5, arg6, (LPCLSID)arg7, (LCID)arg8, arg9, (LPVOID)arg10);
 fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
+	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
 	COM_NATIVE_EXIT(env, that, OleCreatePropertyFrame_FUNC);
 	return rc;
@@ -751,7 +892,7 @@ fail:
 
 #ifndef NO_OleDraw
 JNIEXPORT jint JNICALL COM_NATIVE(OleDraw)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleDraw_FUNC);
@@ -775,15 +916,15 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleFlushClipboard)
 
 #ifndef NO_OleGetClipboard
 JNIEXPORT jint JNICALL COM_NATIVE(OleGetClipboard)
-	(JNIEnv *env, jclass that, jintArray arg0)
+	(JNIEnv *env, jclass that, jintLongArray arg0)
 {
-	jint *lparg0=NULL;
+	jintLong *lparg0=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleGetClipboard_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jint)OleGetClipboard((IDataObject **)lparg0);
 fail:
-	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
+	if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0);
 	COM_NATIVE_EXIT(env, that, OleGetClipboard_FUNC);
 	return rc;
 }
@@ -791,7 +932,7 @@ fail:
 
 #ifndef NO_OleIsCurrentClipboard
 JNIEXPORT jint JNICALL COM_NATIVE(OleIsCurrentClipboard)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleIsCurrentClipboard_FUNC);
@@ -803,7 +944,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleIsCurrentClipboard)
 
 #ifndef NO_OleIsRunning
 JNIEXPORT jboolean JNICALL COM_NATIVE(OleIsRunning)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	COM_NATIVE_ENTER(env, that, OleIsRunning_FUNC);
@@ -815,17 +956,17 @@ JNIEXPORT jboolean JNICALL COM_NATIVE(OleIsRunning)
 
 #ifndef NO_OleLoad
 JNIEXPORT jint JNICALL COM_NATIVE(OleLoad)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLongArray arg3)
 {
 	GUID _arg1, *lparg1=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleLoad_FUNC);
 	if (arg1) if ((lparg1 = getGUIDFields(env, arg1, &_arg1)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	rc = (jint)OleLoad((IStorage *)arg0, lparg1, (IOleClientSite *)arg2, (LPVOID *)lparg3);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) setGUIDFields(env, arg1, lparg1);
 	COM_NATIVE_EXIT(env, that, OleLoad_FUNC);
 	return rc;
@@ -834,7 +975,7 @@ fail:
 
 #ifndef NO_OleRun
 JNIEXPORT jint JNICALL COM_NATIVE(OleRun)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleRun_FUNC);
@@ -846,7 +987,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleRun)
 
 #ifndef NO_OleSave
 JNIEXPORT jint JNICALL COM_NATIVE(OleSave)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleSave_FUNC);
@@ -858,7 +999,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleSave)
 
 #ifndef NO_OleSetClipboard
 JNIEXPORT jint JNICALL COM_NATIVE(OleSetClipboard)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleSetClipboard_FUNC);
@@ -870,7 +1011,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleSetClipboard)
 
 #ifndef NO_OleSetContainedObject
 JNIEXPORT jint JNICALL COM_NATIVE(OleSetContainedObject)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleSetContainedObject_FUNC);
@@ -882,7 +1023,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleSetContainedObject)
 
 #ifndef NO_OleSetMenuDescriptor
 JNIEXPORT jint JNICALL COM_NATIVE(OleSetMenuDescriptor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, OleSetMenuDescriptor_FUNC);
@@ -894,7 +1035,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(OleSetMenuDescriptor)
 
 #ifndef NO_OleTranslateColor
 JNIEXPORT jint JNICALL COM_NATIVE(OleTranslateColor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
@@ -910,17 +1051,17 @@ fail:
 
 #ifndef NO_ProgIDFromCLSID
 JNIEXPORT jint JNICALL COM_NATIVE(ProgIDFromCLSID)
-	(JNIEnv *env, jclass that, jobject arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jobject arg0, jintLongArray arg1)
 {
 	GUID _arg0, *lparg0=NULL;
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, ProgIDFromCLSID_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jint)ProgIDFromCLSID(lparg0, (LPOLESTR *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0);
 	COM_NATIVE_EXIT(env, that, ProgIDFromCLSID_FUNC);
 	return rc;
@@ -929,7 +1070,7 @@ fail:
 
 #ifndef NO_RegisterDragDrop
 JNIEXPORT jint JNICALL COM_NATIVE(RegisterDragDrop)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, RegisterDragDrop_FUNC);
@@ -941,7 +1082,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(RegisterDragDrop)
 
 #ifndef NO_ReleaseStgMedium
 JNIEXPORT void JNICALL COM_NATIVE(ReleaseStgMedium)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	COM_NATIVE_ENTER(env, that, ReleaseStgMedium_FUNC);
 	ReleaseStgMedium((STGMEDIUM *)arg0);
@@ -951,7 +1092,7 @@ JNIEXPORT void JNICALL COM_NATIVE(ReleaseStgMedium)
 
 #ifndef NO_RevokeDragDrop
 JNIEXPORT jint JNICALL COM_NATIVE(RevokeDragDrop)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, RevokeDragDrop_FUNC);
@@ -963,7 +1104,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(RevokeDragDrop)
 
 #ifndef NO_SHDoDragDrop
 JNIEXPORT jint JNICALL COM_NATIVE(SHDoDragDrop)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jintArray arg4)
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
@@ -1003,17 +1144,17 @@ JNIEXPORT jint JNICALL COM_NATIVE(STGMEDIUM_1sizeof)
 
 #ifndef NO_StgCreateDocfile
 JNIEXPORT jint JNICALL COM_NATIVE(StgCreateDocfile)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jintLongArray arg3)
 {
 	jchar *lparg0=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, StgCreateDocfile_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	rc = (jint)StgCreateDocfile(lparg0, arg1, arg2, (IStorage **)lparg3);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	COM_NATIVE_EXIT(env, that, StgCreateDocfile_FUNC);
 	return rc;
@@ -1038,17 +1179,17 @@ fail:
 
 #ifndef NO_StgOpenStorage
 JNIEXPORT jint JNICALL COM_NATIVE(StgOpenStorage)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+	(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLongArray arg5)
 {
 	jchar *lparg0=NULL;
-	jint *lparg5=NULL;
+	jintLong *lparg5=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, StgOpenStorage_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	rc = (jint)StgOpenStorage((const WCHAR *)lparg0, (IStorage *)arg1, arg2, (SNB)arg3, arg4, (IStorage **)lparg5);
 fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
+	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	COM_NATIVE_EXIT(env, that, StgOpenStorage_FUNC);
 	return rc;
@@ -1057,17 +1198,17 @@ fail:
 
 #ifndef NO_StringFromCLSID
 JNIEXPORT jint JNICALL COM_NATIVE(StringFromCLSID)
-	(JNIEnv *env, jclass that, jobject arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jobject arg0, jintLongArray arg1)
 {
 	GUID _arg0, *lparg0=NULL;
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, StringFromCLSID_FUNC);
 	if (arg0) if ((lparg0 = getGUIDFields(env, arg0, &_arg0)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jint)StringFromCLSID(lparg0, (LPOLESTR *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) setGUIDFields(env, arg0, lparg0);
 	COM_NATIVE_EXIT(env, that, StringFromCLSID_FUNC);
 	return rc;
@@ -1075,14 +1216,14 @@ fail:
 #endif
 
 #ifndef NO_SysAllocString
-JNIEXPORT jint JNICALL COM_NATIVE(SysAllocString)
+JNIEXPORT jintLong JNICALL COM_NATIVE(SysAllocString)
 	(JNIEnv *env, jclass that, jcharArray arg0)
 {
 	jchar *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	COM_NATIVE_ENTER(env, that, SysAllocString_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)SysAllocString((OLECHAR *)lparg0);
+	rc = (jintLong)SysAllocString((OLECHAR *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	COM_NATIVE_EXIT(env, that, SysAllocString_FUNC);
@@ -1092,7 +1233,7 @@ fail:
 
 #ifndef NO_SysFreeString
 JNIEXPORT void JNICALL COM_NATIVE(SysFreeString)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	COM_NATIVE_ENTER(env, that, SysFreeString_FUNC);
 	SysFreeString((BSTR)arg0);
@@ -1102,7 +1243,7 @@ JNIEXPORT void JNICALL COM_NATIVE(SysFreeString)
 
 #ifndef NO_SysStringByteLen
 JNIEXPORT jint JNICALL COM_NATIVE(SysStringByteLen)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, SysStringByteLen_FUNC);
@@ -1162,7 +1303,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(VARIANT_1sizeof)
 
 #ifndef NO_VariantChangeType
 JNIEXPORT jint JNICALL COM_NATIVE(VariantChangeType)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jshort arg2, jshort arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jshort arg2, jshort arg3)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VariantChangeType_FUNC);
@@ -1174,7 +1315,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(VariantChangeType)
 
 #ifndef NO_VariantClear
 JNIEXPORT jint JNICALL COM_NATIVE(VariantClear)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VariantClear_FUNC);
@@ -1186,7 +1327,7 @@ JNIEXPORT jint JNICALL COM_NATIVE(VariantClear)
 
 #ifndef NO_VariantInit
 JNIEXPORT void JNICALL COM_NATIVE(VariantInit)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	COM_NATIVE_ENTER(env, that, VariantInit_FUNC);
 	VariantInit((VARIANTARG FAR* )arg0);
@@ -1194,896 +1335,1479 @@ JNIEXPORT void JNICALL COM_NATIVE(VariantInit)
 }
 #endif
 
-#ifndef NO_VtblCall__IIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_VtblCall__IIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO_VtblCall__IIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIIJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO_VtblCall__IIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#if (!defined(NO_VtblCall__IIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIIIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIIIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#if (!defined(NO_VtblCall__IIIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIIIIIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintLong arg7)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIIIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintLong arg7)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIIIIIJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIIIIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIIIIIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIIIIIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+#if (!defined(NO_VtblCall__IIIIIIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJJJIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIIIIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJJJJIIII_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong, jintLong, jintLong, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIIIIIIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJJJJIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+#if (!defined(NO_VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+#endif
 {
 	DVTARGETDEVICE _arg4, *lparg4=NULL;
 	SIZE _arg5, *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#endif
 	if (arg4) if ((lparg4 = getDVTARGETDEVICEFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = getSIZEFields(env, arg5, &_arg5)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, DVTARGETDEVICE *, SIZE *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, DVTARGETDEVICE *, SIZE *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) setSIZEFields(env, arg5, lparg5);
 	if (arg4 && lparg4) setDVTARGETDEVICEFields(env, arg4, lparg4);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLongArray arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLongArray arg6)
+#endif
 {
 	GUID _arg4, *lparg4=NULL;
-	jint *lparg6=NULL;
+	jintLong *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC);
+#endif
 	if (arg4) if ((lparg4 = getGUIDFields(env, arg4, &_arg4)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, GUID *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, lparg6);
+	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong, GUID *, jintLong, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, lparg6);
 fail:
-	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
+	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
 	if (arg4 && lparg4) setGUIDFields(env, arg4, lparg4);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
+#if (!defined(NO_VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4, jint arg5)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4, jint arg5)
+#endif
 {
 	POINT _arg4, *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#endif
 	if (arg4) if ((lparg4 = getPOINTFields(env, arg4, &_arg4)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, POINT *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong, POINT *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5);
 fail:
 	if (arg4 && lparg4) setPOINTFields(env, arg4, lparg4);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4)
+#endif
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIII_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJII_3I_FUNC);
+#endif
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIII_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJII_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIII_3J
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlongArray arg4)
+#if (!defined(NO_VtblCall__IIII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJII_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4)
+#endif
 {
 	jlong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIII_3J_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJII_3J_FUNC);
+#endif
 	if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIII_3J_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJII_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIJ_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIJ_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIIJ_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIJ_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jintArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jintArray arg4)
+#endif
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIJ_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJIJ_3I_FUNC);
+#endif
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIJ_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJIJ_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLongArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLongArray arg4)
+#endif
 {
 	FORMATETC _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getFORMATETCFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, FORMATETC *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, FORMATETC *, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setFORMATETCFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
+#endif
 {
 	GUID _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, GUID *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, GUID *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jint arg5)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jintLong arg5)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jintLong arg5)
+#endif
 {
 	GUID _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, GUID *, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, GUID *, jintLong, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5);
 fail:
 	if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jint arg7, jobject arg8, jintArray arg9)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jintLong arg7, jobject arg8, jintArray arg9)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jobject arg6, jintLong arg7, jobject arg8, jintArray arg9)
+#endif
 {
 	GUID _arg3, *lparg3=NULL;
 	DISPPARAMS _arg6, *lparg6=NULL;
 	EXCEPINFO _arg8, *lparg8=NULL;
 	jint *lparg9=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = getDISPPARAMSFields(env, arg6, &_arg6)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = getEXCEPINFOFields(env, arg8, &_arg8)) == NULL) goto fail;
 	if (arg9) if ((lparg9 = (*env)->GetIntArrayElements(env, arg9, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, GUID *, jint, jint, DISPPARAMS *, jint, EXCEPINFO *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6, arg7, lparg8, lparg9);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, GUID *, jint, jint, DISPPARAMS *, jintLong, EXCEPINFO *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6, arg7, lparg8, lparg9);
 fail:
 	if (arg9 && lparg9) (*env)->ReleaseIntArrayElements(env, arg9, lparg9, 0);
 	if (arg8 && lparg8) setEXCEPINFOFields(env, arg8, lparg8);
 	if (arg6 && lparg6) setDISPPARAMSFields(env, arg6, lparg6);
 	if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLongArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLongArray arg4)
+#endif
 {
 	STATSTG _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getSTATSTGFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, STATSTG *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, STATSTG *, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setSTATSTGFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jint arg6, jobject arg7)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jint arg5, jintLong arg6, jobject arg7)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jint arg5, jintLong arg6, jobject arg7)
+#endif
 {
 	MSG _arg3, *lparg3=NULL;
 	RECT _arg7, *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getMSGFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = getRECTFields(env, arg7, &_arg7)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, MSG *, jint, jint, jint, RECT *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, arg6, lparg7);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, MSG *, jintLong, jint, jintLong, RECT *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, arg6, lparg7);
 fail:
 	if (arg7 && lparg7) setRECTFields(env, arg7, lparg7);
 	if (arg3 && lparg3) setMSGFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
+#endif
 {
 	POINT _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getPOINTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, POINT *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, POINT *, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setPOINTFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
+#endif
 {
 	SIZE _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getSIZEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, SIZE *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, SIZE *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) setSIZEFields(env, arg3, lparg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIZ
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3)
+#if (!defined(NO_VtblCall__IIIZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIIZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jboolean arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jboolean arg3)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIIZ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJZ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jboolean))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIIZ_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+#if (!defined(NO_VtblCall__III_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3)
+#endif
 {
 	jint *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__III_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJI_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__III_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3II_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3II_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__III_3II_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3JI_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLongArray arg3, jint arg4, jintArray arg5)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3JI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLongArray arg3, jint arg4, jintArray arg5)
+#endif
 {
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__III_3II_3I_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJI_3JI_3I_FUNC);
+#endif
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jintLong *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__III_3II_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJI_3JI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3I_3I_3I_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3I_3I_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__III_3I_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3J_3J_3I_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5, jintLongArray arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3J_3J_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5, jintLongArray arg6)
+#endif
 {
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
 	jint *lparg5=NULL;
-	jint *lparg6=NULL;
+	jintLong *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__III_3I_3I_3I_3I_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJI_3J_3J_3I_3J_FUNC);
+#endif
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
+	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jintLong *, jintLong *, jint *, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
 fail:
-	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
+	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__III_3I_3I_3I_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJI_3J_3J_3I_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3J
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlongArray arg3)
+#if (!defined(NO_VtblCall__III_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__III_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlongArray arg3)
+#endif
 {
 	jlong *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__III_3J_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJI_3J_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__III_3J_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJI_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJI_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJI_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IIJI_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJI_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jintArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jintArray arg4)
+#endif
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIJI_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJI_3I_FUNC);
+#endif
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIJI_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJI_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJ_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jintArray arg3)
+#if (!defined(NO_VtblCall__IIJ_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3)
+#endif
 {
 	jint *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIJ_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJ_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIJ_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJ_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	CAUUID _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getCAUUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, CAUUID *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, CAUUID *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setCAUUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	CONTROLINFO _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getCONTROLINFOFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, CONTROLINFO *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, CONTROLINFO *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setCONTROLINFOFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	FORMATETC _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getFORMATETCFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, FORMATETC *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, FORMATETC *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setFORMATETCFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3)
+#endif
 {
 	FORMATETC _arg2, *lparg2=NULL;
 	STGMEDIUM _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getFORMATETCFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getSTGMEDIUMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, FORMATETC *, STGMEDIUM *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, FORMATETC *, STGMEDIUM *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) setSTGMEDIUMFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setFORMATETCFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jboolean arg4)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jboolean arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jboolean arg4)
+#endif
 {
 	FORMATETC _arg2, *lparg2=NULL;
 	STGMEDIUM _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getFORMATETCFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getSTGMEDIUMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, FORMATETC *, STGMEDIUM *, jboolean))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, FORMATETC *, STGMEDIUM *, jboolean))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setSTGMEDIUMFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setFORMATETCFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	GUID _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, GUID *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jintLong arg5, jintLong arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jintLong arg5, jintLong arg6)
+#endif
 {
 	GUID _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, GUID *, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jint, jint, jintLong, jintLong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
 fail:
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLong arg3, jint arg4, jint arg5, jintArray arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLong arg3, jint arg4, jint arg5, jintArray arg6)
+#endif
 {
 	GUID _arg2, *lparg2=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, GUID *, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jintLong, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jobject arg4, jobject arg5)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jobject arg5)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jobject arg5)
+#endif
 {
 	GUID _arg2, *lparg2=NULL;
 	OLECMD _arg4, *lparg4=NULL;
 	OLECMDTEXT _arg5, *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getOLECMDFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = getOLECMDTEXTFields(env, arg5, &_arg5)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, GUID *, jint, OLECMD *, OLECMDTEXT *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jint, OLECMD *, OLECMDTEXT *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) setOLECMDTEXTFields(env, arg5, lparg5);
 	if (arg4 && lparg4) setOLECMDFields(env, arg4, lparg4);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintLongArray arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintLongArray arg4)
+#endif
 {
 	GUID _arg2, *lparg2=NULL;
 	GUID _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getGUIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, GUID *, GUID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, GUID *, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setGUIDFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLongArray arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLongArray arg3)
+#endif
 {
 	GUID _arg2, *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getGUIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, GUID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, GUID *, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setGUIDFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	LICINFO _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getLICINFOFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, LICINFO *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, LICINFO *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLICINFOFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	MSG _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getMSGFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, MSG *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, MSG *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setMSGFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3)
+#endif
 {
 	POINT _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getPOINTFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, POINT *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, POINT *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setPOINTFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	RECT _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, RECT *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, RECT *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jboolean arg4)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLong arg3, jboolean arg4)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLong arg3, jboolean arg4)
+#endif
 {
 	RECT _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, RECT *, jint, jboolean))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, RECT *, jintLong, jboolean))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4);
 fail:
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3)
+#endif
 {
 	RECT _arg2, *lparg2=NULL;
 	RECT _arg3, *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getRECTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, RECT *, RECT *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, RECT *, RECT *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) setRECTFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLong arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintLong arg3)
+#endif
 {
 	SHDRAGIMAGE _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getSHDRAGIMAGEFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, SHDRAGIMAGE *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, SHDRAGIMAGE *, jintLong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setSHDRAGIMAGEFields(env, arg2, lparg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIZ
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIZ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+#if (!defined(NO_VtblCall__IIZ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJZ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IIZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jboolean arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJZ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jboolean arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IIZ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jboolean))(*(jint **)arg1)[arg0])(arg1, arg2);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJZ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jboolean))(*(jintLong **)arg1)[arg0])(arg1, arg2);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IIZ_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJZ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3C
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2)
+#if (!defined(NO_VtblCall__II_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3C) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3C_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3C_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3C_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CI
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3)
+#if (!defined(NO_VtblCall__II_3CI) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jintLong arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jintLong arg3)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3CI_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jintLong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3CI_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CIIII_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIIII_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7)
+#if (!defined(NO_VtblCall__II_3CIIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CJIII_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jintLong arg3, jint arg4, jint arg5, jint arg6, jintLongArray arg7)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CJIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jintLong arg3, jint arg4, jint arg5, jint arg6, jintLongArray arg7)
+#endif
 {
 	jchar *lparg2=NULL;
-	jint *lparg7=NULL;
+	jintLong *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3CIIII_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CJIII_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6, lparg7);
+	if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jintLong, jint, jint, jint, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6, lparg7);
 fail:
-	if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
+	if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3CIIII_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CJIII_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CIII_3I
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIII_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__II_3CIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CIII_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jintArray arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jintArray arg6)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3CIII_3I_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIII_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3CIII_3I_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIII_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CIII_3J
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIII_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jlongArray arg6)
+#if (!defined(NO_VtblCall__II_3CIII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CIII_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jlongArray arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jlongArray arg6)
+#endif
 {
 	jchar *lparg2=NULL;
 	jlong *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3CIII_3J_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIII_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3CIII_3J_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIII_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CJII_3J
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CJII_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6)
+#if (!defined(NO_VtblCall__II_3CJII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CJII_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3CJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3CJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jint arg4, jint arg5, jlongArray arg6)
+#endif
 {
 	jchar *lparg2=NULL;
 	jlong *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3CJII_3J_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3CJII_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jlong, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jlong, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, lparg6);
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3CJII_3J_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3CJII_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3C_3C
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3C_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3)
+#if (!defined(NO_VtblCall__II_3C_3C) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3C_3C) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3)
+#endif
 {
 	jchar *lparg2=NULL;
 	jchar *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__II_3C_3C_FUNC);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJ_3C_3C_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__II_3C_3C_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJ_3C_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -2100,21 +2824,32 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJIIIIJ)
 }
 #endif
 
-#ifndef NO_VtblCall__IJJIIIII
-JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#if (!defined(NO_VtblCall__IJJIIIII) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJIIIIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJIIIII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintLong arg7)
+#else
+JNIEXPORT jint JNICALL COM_NATIVE(VtblCall__IJJIIIIJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintLong arg7)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	COM_NATIVE_ENTER(env, that, VtblCall__IJJIIIII_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#else
+	COM_NATIVE_ENTER(env, that, VtblCall__IJJIIIIJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jint, jint, jintLong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
 	COM_NATIVE_EXIT(env, that, VtblCall__IJJIIIII_FUNC);
+#else
+	COM_NATIVE_EXIT(env, that, VtblCall__IJJIIIIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_WriteClassStg
 JNIEXPORT jint JNICALL COM_NATIVE(WriteClassStg)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GUID _arg1, *lparg1=NULL;
 	jint rc = 0;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c
index fdb39114af..9baabd7acb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_custom.c
@@ -16,236 +16,236 @@
 #define COM_NATIVE(func) Java_org_eclipse_swt_internal_ole_win32_COM_##func
 
 #ifndef NO_get_1accChild_1CALLBACK
-static SWT_PTR get_accChild_CALLBACK;
+static jintLong get_accChild_CALLBACK;
 static HRESULT CALLBACK get_accChild(void* ppVTable, VARIANT varChildID, IDispatch** ppdispChild)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, IDispatch**))get_accChild_CALLBACK)(ppVTable, &varChildID, ppdispChild);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accChild_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accChild_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accChild_CALLBACK = func;
-	return (SWT_PTR)get_accChild;
+	return (jintLong)get_accChild;
 }
 #endif
 
 #ifndef NO_get_1accName_1CALLBACK
-static SWT_PTR get_accName_CALLBACK;
+static jintLong get_accName_CALLBACK;
 static HRESULT CALLBACK get_accName(void* ppVTable, VARIANT varID, BSTR* pszName)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accName_CALLBACK)(ppVTable, &varID, pszName);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accName_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accName_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accName_CALLBACK = func;
-	return (SWT_PTR)get_accName;
+	return (jintLong)get_accName;
 }
 #endif
 
 #ifndef NO_get_1accValue_1CALLBACK
-static SWT_PTR get_accValue_CALLBACK;
+static jintLong get_accValue_CALLBACK;
 static HRESULT CALLBACK get_accValue(void* ppVTable, VARIANT varID, BSTR* pszValue)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accValue_CALLBACK)(ppVTable, &varID, pszValue);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accValue_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accValue_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accValue_CALLBACK = func;
-	return (SWT_PTR)get_accValue;
+	return (jintLong)get_accValue;
 }
 #endif
 
 #ifndef NO_get_1accDescription_1CALLBACK
-static SWT_PTR get_accDescription_CALLBACK;
+static jintLong get_accDescription_CALLBACK;
 static HRESULT CALLBACK get_accDescription( void* ppVTable, VARIANT varID, BSTR* pszDescription)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accDescription_CALLBACK)(ppVTable, &varID, pszDescription);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accDescription_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accDescription_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accDescription_CALLBACK = func;
-	return (SWT_PTR)get_accDescription;
+	return (jintLong)get_accDescription;
 }
 #endif
 
 #ifndef NO_get_1accRole_1CALLBACK
-static SWT_PTR get_accRole_CALLBACK;
+static jintLong get_accRole_CALLBACK;
 static HRESULT CALLBACK get_accRole(void* ppVTable, VARIANT varID, VARIANT* pvarRole)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, VARIANT*))get_accRole_CALLBACK)(ppVTable, &varID, pvarRole);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accRole_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accRole_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accRole_CALLBACK = func;
-	return (SWT_PTR)get_accRole;
+	return (jintLong)get_accRole;
 }
 #endif
 
 #ifndef NO_get_1accState_1CALLBACK
-static SWT_PTR get_accState_CALLBACK;
+static jintLong get_accState_CALLBACK;
 static HRESULT CALLBACK get_accState(void* ppVTable, VARIANT varID, VARIANT* pvarState)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, VARIANT*))get_accState_CALLBACK)(ppVTable, &varID, pvarState);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accState_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accState_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accState_CALLBACK = func;
-	return (SWT_PTR)get_accState;
+	return (jintLong)get_accState;
 }
 #endif
 
 #ifndef NO_get_1accHelp_1CALLBACK
-static SWT_PTR get_accHelp_CALLBACK;
+static jintLong get_accHelp_CALLBACK;
 static HRESULT CALLBACK get_accHelp(void* ppVTable, VARIANT varID, BSTR* pszHelp)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accHelp_CALLBACK)(ppVTable, &varID, pszHelp);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accHelp_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accHelp_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accHelp_CALLBACK = func;
-	return (SWT_PTR)get_accHelp;
+	return (jintLong)get_accHelp;
 }
 #endif
 
 #ifndef NO_get_1accHelpTopic_1CALLBACK
-static SWT_PTR get_accHelpTopic_CALLBACK;
+static jintLong get_accHelpTopic_CALLBACK;
 static HRESULT CALLBACK get_accHelpTopic(void* ppVTable, BSTR* pszHelpFile, VARIANT varChild, long* pidTopic)
 {
 	return ((HRESULT (CALLBACK *)(void*, BSTR*, VARIANT*, long*))get_accHelpTopic_CALLBACK)(ppVTable, pszHelpFile, &varChild, pidTopic);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accHelpTopic_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accHelpTopic_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accHelpTopic_CALLBACK = func;
-	return (SWT_PTR)get_accHelpTopic;
+	return (jintLong)get_accHelpTopic;
 }
 #endif
 
 #ifndef NO_get_1accKeyboardShortcut_1CALLBACK
-static SWT_PTR get_accKeyboardShortcut_CALLBACK;
+static jintLong get_accKeyboardShortcut_CALLBACK;
 static HRESULT CALLBACK get_accKeyboardShortcut(void* ppVTable, VARIANT varID, BSTR* pszKeyboardShortcut)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accKeyboardShortcut_CALLBACK)(ppVTable, &varID, pszKeyboardShortcut);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accKeyboardShortcut_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accKeyboardShortcut_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accKeyboardShortcut_CALLBACK = func;
-	return (SWT_PTR)get_accKeyboardShortcut;
+	return (jintLong)get_accKeyboardShortcut;
 }
 #endif
 
 #ifndef NO_get_1accDefaultAction_1CALLBACK
-static SWT_PTR get_accDefaultAction_CALLBACK;
+static jintLong get_accDefaultAction_CALLBACK;
 static HRESULT CALLBACK get_accDefaultAction(void* ppVTable, VARIANT varID, BSTR* pszDefaultAction)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))get_accDefaultAction_CALLBACK)(ppVTable, &varID, pszDefaultAction);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(get_1accDefaultAction_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(get_1accDefaultAction_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	get_accDefaultAction_CALLBACK = func;
-	return (SWT_PTR)get_accDefaultAction;
+	return (jintLong)get_accDefaultAction;
 }
 #endif
 
 #ifndef NO_accSelect_1CALLBACK
-static SWT_PTR accSelect_CALLBACK;
+static jintLong accSelect_CALLBACK;
 static HRESULT CALLBACK accSelect(void* ppVTable, long flagsSelect, VARIANT varID)
 {
 	return ((HRESULT (CALLBACK *)(void*, long, VARIANT*))accSelect_CALLBACK)(ppVTable, flagsSelect, &varID);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(accSelect_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(accSelect_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	accSelect_CALLBACK = func;
-	return (SWT_PTR)accSelect;
+	return (jintLong)accSelect;
 }
 #endif
 
 #ifndef NO_accLocation_1CALLBACK
-static SWT_PTR accLocation_CALLBACK;
+static jintLong accLocation_CALLBACK;
 static HRESULT CALLBACK accLocation(void* ppVTable, long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID) 
 {
 	return ((HRESULT (CALLBACK *)(void*, long*, long*, long*, long*, VARIANT*))accLocation_CALLBACK)(ppVTable, pxLeft, pyTop, pcxWidth, pcyHeight, &varID);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(accLocation_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(accLocation_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	accLocation_CALLBACK = func;
-	return (SWT_PTR)accLocation;
+	return (jintLong)accLocation;
 }
 #endif
 
 #ifndef NO_accNavigate_1CALLBACK
-static SWT_PTR accNavigate_CALLBACK;
+static jintLong accNavigate_CALLBACK;
 static HRESULT CALLBACK accNavigate(void* ppVTable, long navDir, VARIANT varStart, VARIANT* pvarEnd)
 {
 	return ((HRESULT (CALLBACK *)(void*, long, VARIANT*, VARIANT*))accNavigate_CALLBACK)(ppVTable, navDir, &varStart, pvarEnd);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(accNavigate_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(accNavigate_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	accNavigate_CALLBACK = func;
-	return (SWT_PTR)accNavigate;
+	return (jintLong)accNavigate;
 }
 #endif
 
 #ifndef NO_accDoDefaultAction_1CALLBACK
-static SWT_PTR accDoDefaultAction_CALLBACK;
+static jintLong accDoDefaultAction_CALLBACK;
 static HRESULT CALLBACK accDoDefaultAction(void* ppVTable, VARIANT varID)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*))accDoDefaultAction_CALLBACK)(ppVTable, &varID);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(accDoDefaultAction_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(accDoDefaultAction_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	accDoDefaultAction_CALLBACK = func;
-	return (SWT_PTR)accDoDefaultAction;
+	return (jintLong)accDoDefaultAction;
 }
 #endif
 
 #ifndef NO_put_1accName_1CALLBACK
-static SWT_PTR put_accName_CALLBACK;
+static jintLong put_accName_CALLBACK;
 static HRESULT CALLBACK put_accName(void* ppVTable, VARIANT varID, BSTR* pszName)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))put_accName_CALLBACK)(ppVTable, &varID, pszName);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(put_1accName_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(put_1accName_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	put_accName_CALLBACK = func;
-	return (SWT_PTR)put_accName;
+	return (jintLong)put_accName;
 }
 #endif
 
 #ifndef NO_put_1accValue_1CALLBACK
-static SWT_PTR put_accValue_CALLBACK;
+static jintLong put_accValue_CALLBACK;
 static HRESULT CALLBACK put_accValue(void* ppVTable, VARIANT varID, BSTR* pszValue)
 {
 	return ((HRESULT (CALLBACK *)(void*, VARIANT*, BSTR*))put_accValue_CALLBACK)(ppVTable, &varID, pszValue);
 }
-JNIEXPORT SWT_PTR JNICALL COM_NATIVE(put_1accValue_1CALLBACK)
-	(JNIEnv *env, jclass that, SWT_PTR func)
+JNIEXPORT jintLong JNICALL COM_NATIVE(put_1accValue_1CALLBACK)
+	(JNIEnv *env, jclass that, jintLong func)
 {
 	put_accValue_CALLBACK = func;
-	return (SWT_PTR)put_accValue;
+	return (jintLong)put_accValue;
 }
 #endif
 
 #ifndef NO_VtblCall_1PPPPVARIANT
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1PPPPVARIANT)
-	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, SWT_PTR arg2, SWT_PTR arg3, SWT_PTR arg4, SWT_PTR arg5, SWT_PTR arg6)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VtblCall_1PPPPVARIANT_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(SWT_PTR, SWT_PTR, SWT_PTR, SWT_PTR, SWT_PTR, VARIANT))(*(SWT_PTR **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, *(VARIANT *)arg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, jintLong, jintLong, jintLong, VARIANT))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, *(VARIANT *)arg6);
 	COM_NATIVE_EXIT(env, that, VtblCall_1PPPPVARIANT_FUNC);
 	return rc;
 }
@@ -253,11 +253,11 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1PPPPVARIANT)
 
 #ifndef NO_VtblCall_1IVARIANT
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1IVARIANT)
-	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, jint arg2, SWT_PTR arg3)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLong arg3)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VtblCall_1IVARIANT_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(SWT_PTR, jint, VARIANT))(*(SWT_PTR **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, VARIANT))(*(jintLong **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3);
 	COM_NATIVE_EXIT(env, that, VtblCall_1IVARIANT_FUNC);
 	return rc;
 }
@@ -265,11 +265,11 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1IVARIANT)
 
 #ifndef NO_VtblCall_1PVARIANTP
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1PVARIANTP)
-	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, SWT_PTR arg2, SWT_PTR arg3, SWT_PTR arg4)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VtblCall_1PVARIANTP_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(SWT_PTR, SWT_PTR, VARIANT, SWT_PTR))(*(SWT_PTR **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jintLong, VARIANT, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3, arg4);
 	COM_NATIVE_EXIT(env, that, VtblCall_1PVARIANTP_FUNC);
 	return rc;
 }
@@ -277,11 +277,11 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1PVARIANTP)
 
 #ifndef NO_VtblCall_1IVARIANTP
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1IVARIANTP)
-	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, jint arg2, SWT_PTR arg3, SWT_PTR arg4)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VtblCall_1IVARIANTP_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(SWT_PTR, jint, VARIANT, SWT_PTR))(*(SWT_PTR **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3, arg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, VARIANT, jintLong))(*(jintLong **)arg1)[arg0])(arg1, arg2, *(VARIANT *)arg3, arg4);
 	COM_NATIVE_EXIT(env, that, VtblCall_1IVARIANTP_FUNC);
 	return rc;
 }
@@ -289,11 +289,11 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1IVARIANTP)
 
 #ifndef NO_VtblCall_1VARIANT
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1VARIANT)
-	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, SWT_PTR arg2)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VtblCall_1VARIANT_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(SWT_PTR, VARIANT))(*(SWT_PTR **)arg1)[arg0])(arg1, *(VARIANT *)arg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, VARIANT))(*(jintLong **)arg1)[arg0])(arg1, *(VARIANT *)arg2);
 	COM_NATIVE_EXIT(env, that, VtblCall_1VARIANT_FUNC);
 	return rc;
 }
@@ -301,11 +301,11 @@ JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1VARIANT)
 
 #ifndef NO_VtblCall_1VARIANTI
 JNIEXPORT jint JNICALL COM_NATIVE(VtblCall_1VARIANTP)
-	(JNIEnv *env, jclass that, jint arg0, SWT_PTR arg1, SWT_PTR arg2, SWT_PTR arg3)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jintLong arg3)
 {
 	jint rc = 0;
 	COM_NATIVE_ENTER(env, that, VtblCall_1VARIANTP_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(SWT_PTR, VARIANT, SWT_PTR))(*(SWT_PTR **)arg1)[arg0])(arg1, *(VARIANT *)arg2, arg3);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, VARIANT, jintLong))(*(jintLong **)arg1)[arg0])(arg1, *(VARIANT *)arg2, arg3);
 	COM_NATIVE_EXIT(env, that, VtblCall_1VARIANTP_FUNC);
 	return rc;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c
index 3e98a9babf..23766d834c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.c
@@ -43,21 +43,81 @@ char * COM_nativeFunctionNames[] = {
 	"IsEqualGUID",
 	"LICINFO_1sizeof",
 	"LresultFromObject",
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI",
+#endif
 	"OLECMD_1sizeof",
 	"OLEINPLACEFRAMEINFO_1sizeof",
 	"OleCreate",
@@ -96,61 +156,277 @@ char * COM_nativeFunctionNames[] = {
 	"VariantChangeType",
 	"VariantClear",
 	"VariantInit",
+#ifndef JNI64
 	"VtblCall__IIII",
+#else
+	"VtblCall__IJJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIII",
+#else
+	"VtblCall__IJIIJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIII",
+#else
+	"VtblCall__IJIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIIII",
+#else
+	"VtblCall__IJIIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIIIII",
+#else
+	"VtblCall__IJIIIIIJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIIIIIIII",
+#else
+	"VtblCall__IJJJJJIIII",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2",
+#else
+	"VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I",
+#else
+	"VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I",
+#else
+	"VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII_3I",
+#else
+	"VtblCall__IJII_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIII_3J",
+#else
+	"VtblCall__IJII_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIJ_3I",
+#else
+	"VtblCall__IJIJ_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I",
+#else
+	"VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2",
+#else
+	"VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II",
+#else
+	"VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I",
+#else
+	"VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I",
+#else
+	"VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2",
+#else
+	"VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I",
+#else
+	"VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2",
+#else
+	"VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIZ",
+#else
+	"VtblCall__IJJZ",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3I",
+#else
+	"VtblCall__IJI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3II_3I",
+#else
+	"VtblCall__IJI_3JI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3I_3I_3I_3I",
+#else
+	"VtblCall__IJI_3J_3J_3I_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3J",
+#else
+	"VtblCall__IJI_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJI_3I",
+#else
+	"VtblCall__IJJI_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ_3I",
+#else
+	"VtblCall__IJJ_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIZ",
+#else
+	"VtblCall__IJZ",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3C",
+#else
+	"VtblCall__IJ_3C",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CI",
+#else
+	"VtblCall__IJ_3CJ",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CIIII_3I",
+#else
+	"VtblCall__IJ_3CJIII_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CIII_3I",
+#else
+	"VtblCall__IJ_3CIII_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CIII_3J",
+#else
+	"VtblCall__IJ_3CIII_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CJII_3J",
+#else
+	"VtblCall__IJ_3CJII_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3C_3C",
+#else
+	"VtblCall__IJ_3C_3C",
+#endif
 	"VtblCall__IJIIIIJ",
+#ifndef JNI64
 	"VtblCall__IJJIIIII",
+#else
+	"VtblCall__IJJIIIIJ",
+#endif
 	"VtblCall_1IVARIANT",
 	"VtblCall_1IVARIANTP",
 	"VtblCall_1PPPPVARIANT",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h
index a6db98fdf8..5aca2992f2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_stats.h
@@ -51,21 +51,81 @@ typedef enum {
 	IsEqualGUID_FUNC,
 	LICINFO_1sizeof_FUNC,
 	LresultFromObject_FUNC,
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_ole_win32_FORMATETC_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_ole_win32_GUID_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_ole_win32_OLEINPLACEFRAMEINFO_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STATSTG_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FORMATETC_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_FUNCDESC_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_GUID_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STATSTG_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_TYPEATTR_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARDESC_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_ole_win32_VARIANT_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2JI_FUNC,
+#endif
 	OLECMD_1sizeof_FUNC,
 	OLEINPLACEFRAMEINFO_1sizeof_FUNC,
 	OleCreate_FUNC,
@@ -104,61 +164,277 @@ typedef enum {
 	VariantChangeType_FUNC,
 	VariantClear_FUNC,
 	VariantInit_FUNC,
+#ifndef JNI64
 	VtblCall__IIII_FUNC,
+#else
+	VtblCall__IJJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIII_FUNC,
+#else
+	VtblCall__IJIIJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIII_FUNC,
+#else
+	VtblCall__IJIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIIII_FUNC,
+#else
+	VtblCall__IJIIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIIIII_FUNC,
+#else
+	VtblCall__IJIIIIIJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIIIIIIII_FUNC,
+#else
+	VtblCall__IJJJJJIIII_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+#else
+	VtblCall__IJIILorg_eclipse_swt_internal_ole_win32_DVTARGETDEVICE_2Lorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIILorg_eclipse_swt_internal_ole_win32_GUID_2I_3I_FUNC,
+#else
+	VtblCall__IJJJLorg_eclipse_swt_internal_ole_win32_GUID_2J_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
+#else
+	VtblCall__IJJJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_3I_FUNC,
+#else
+	VtblCall__IJII_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIII_3J_FUNC,
+#else
+	VtblCall__IJII_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIJ_3I_FUNC,
+#else
+	VtblCall__IJIJ_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3I_FUNC,
+#else
+	VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC,
+#else
+	VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2II_FUNC,
+#else
+	VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2JJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2ILorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC,
+#else
+	VtblCall__IJILorg_eclipse_swt_internal_ole_win32_GUID_2IILorg_eclipse_swt_internal_ole_win32_DISPPARAMS_2JLorg_eclipse_swt_internal_ole_win32_EXCEPINFO_2_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_ole_win32_STATSTG_2_3I_FUNC,
+#else
+	VtblCall__IJJLorg_eclipse_swt_internal_ole_win32_STATSTG_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_win32_MSG_2IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#else
+	VtblCall__IJILorg_eclipse_swt_internal_win32_MSG_2JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
+#else
+	VtblCall__IJJLorg_eclipse_swt_internal_win32_POINT_2J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+#else
+	VtblCall__IJILorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIZ_FUNC,
+#else
+	VtblCall__IJJZ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3I_FUNC,
+#else
+	VtblCall__IJI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3II_3I_FUNC,
+#else
+	VtblCall__IJI_3JI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3I_3I_3I_3I_FUNC,
+#else
+	VtblCall__IJI_3J_3J_3I_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3J_FUNC,
+#else
+	VtblCall__IJI_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJI_3I_FUNC,
+#else
+	VtblCall__IJJI_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_3I_FUNC,
+#else
+	VtblCall__IJJ_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CAUUID_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_CONTROLINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_FORMATETC_2Lorg_eclipse_swt_internal_ole_win32_STGMEDIUM_2Z_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2IIII_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2IIJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2III_3I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2JII_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2ILorg_eclipse_swt_internal_ole_win32_OLECMD_2Lorg_eclipse_swt_internal_ole_win32_OLECMDTEXT_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2Lorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_GUID_2_3I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_GUID_2_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_ole_win32_LICINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_MSG_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_MSG_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2IZ_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2JZ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_RECT_2Lorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIZ_FUNC,
+#else
+	VtblCall__IJZ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3C_FUNC,
+#else
+	VtblCall__IJ_3C_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CI_FUNC,
+#else
+	VtblCall__IJ_3CJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CIIII_3I_FUNC,
+#else
+	VtblCall__IJ_3CJIII_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CIII_3I_FUNC,
+#else
+	VtblCall__IJ_3CIII_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CIII_3J_FUNC,
+#else
+	VtblCall__IJ_3CIII_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CJII_3J_FUNC,
+#else
+	VtblCall__IJ_3CJII_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3C_3C_FUNC,
+#else
+	VtblCall__IJ_3C_3C_FUNC,
+#endif
 	VtblCall__IJIIIIJ_FUNC,
+#ifndef JNI64
 	VtblCall__IJJIIIII_FUNC,
+#else
+	VtblCall__IJJIIIIJ_FUNC,
+#endif
 	VtblCall_1IVARIANT_FUNC,
 	VtblCall_1IVARIANTP_FUNC,
 	VtblCall_1PPPPVARIANT_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c
index 700e21c89c..7f6dab7ff3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/com_structs.c
@@ -26,7 +26,7 @@ void cacheCAUUIDFields(JNIEnv *env, jobject lpObject)
 	if (CAUUIDFc.cached) return;
 	CAUUIDFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	CAUUIDFc.cElems = (*env)->GetFieldID(env, CAUUIDFc.clazz, "cElems", "I");
-	CAUUIDFc.pElems = (*env)->GetFieldID(env, CAUUIDFc.clazz, "pElems", "I");
+	CAUUIDFc.pElems = (*env)->GetFieldID(env, CAUUIDFc.clazz, "pElems", I_J);
 	CAUUIDFc.cached = 1;
 }
 
@@ -34,7 +34,7 @@ CAUUID *getCAUUIDFields(JNIEnv *env, jobject lpObject, CAUUID *lpStruct)
 {
 	if (!CAUUIDFc.cached) cacheCAUUIDFields(env, lpObject);
 	lpStruct->cElems = (*env)->GetIntField(env, lpObject, CAUUIDFc.cElems);
-	lpStruct->pElems = (GUID FAR *)(*env)->GetIntField(env, lpObject, CAUUIDFc.pElems);
+	lpStruct->pElems = (GUID FAR *)(*env)->GetIntLongField(env, lpObject, CAUUIDFc.pElems);
 	return lpStruct;
 }
 
@@ -42,7 +42,7 @@ void setCAUUIDFields(JNIEnv *env, jobject lpObject, CAUUID *lpStruct)
 {
 	if (!CAUUIDFc.cached) cacheCAUUIDFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, CAUUIDFc.cElems, (jint)lpStruct->cElems);
-	(*env)->SetIntField(env, lpObject, CAUUIDFc.pElems, (jint)lpStruct->pElems);
+	(*env)->SetIntLongField(env, lpObject, CAUUIDFc.pElems, (jintLong)lpStruct->pElems);
 }
 #endif
 
@@ -60,7 +60,7 @@ void cacheCONTROLINFOFields(JNIEnv *env, jobject lpObject)
 	if (CONTROLINFOFc.cached) return;
 	CONTROLINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	CONTROLINFOFc.cb = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "cb", "I");
-	CONTROLINFOFc.hAccel = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "hAccel", "I");
+	CONTROLINFOFc.hAccel = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "hAccel", I_J);
 	CONTROLINFOFc.cAccel = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "cAccel", "S");
 	CONTROLINFOFc.dwFlags = (*env)->GetFieldID(env, CONTROLINFOFc.clazz, "dwFlags", "I");
 	CONTROLINFOFc.cached = 1;
@@ -70,7 +70,7 @@ CONTROLINFO *getCONTROLINFOFields(JNIEnv *env, jobject lpObject, CONTROLINFO *lp
 {
 	if (!CONTROLINFOFc.cached) cacheCONTROLINFOFields(env, lpObject);
 	lpStruct->cb = (*env)->GetIntField(env, lpObject, CONTROLINFOFc.cb);
-	lpStruct->hAccel = (HACCEL)(*env)->GetIntField(env, lpObject, CONTROLINFOFc.hAccel);
+	lpStruct->hAccel = (HACCEL)(*env)->GetIntLongField(env, lpObject, CONTROLINFOFc.hAccel);
 	lpStruct->cAccel = (*env)->GetShortField(env, lpObject, CONTROLINFOFc.cAccel);
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, CONTROLINFOFc.dwFlags);
 	return lpStruct;
@@ -80,7 +80,7 @@ void setCONTROLINFOFields(JNIEnv *env, jobject lpObject, CONTROLINFO *lpStruct)
 {
 	if (!CONTROLINFOFc.cached) cacheCONTROLINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, CONTROLINFOFc.cb, (jint)lpStruct->cb);
-	(*env)->SetIntField(env, lpObject, CONTROLINFOFc.hAccel, (jint)lpStruct->hAccel);
+	(*env)->SetIntLongField(env, lpObject, CONTROLINFOFc.hAccel, (jintLong)lpStruct->hAccel);
 	(*env)->SetShortField(env, lpObject, CONTROLINFOFc.cAccel, (jshort)lpStruct->cAccel);
 	(*env)->SetIntField(env, lpObject, CONTROLINFOFc.dwFlags, (jint)lpStruct->dwFlags);
 }
@@ -100,8 +100,8 @@ void cacheCOSERVERINFOFields(JNIEnv *env, jobject lpObject)
 	if (COSERVERINFOFc.cached) return;
 	COSERVERINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	COSERVERINFOFc.dwReserved1 = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "dwReserved1", "I");
-	COSERVERINFOFc.pwszName = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pwszName", "I");
-	COSERVERINFOFc.pAuthInfo = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pAuthInfo", "I");
+	COSERVERINFOFc.pwszName = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pwszName", I_J);
+	COSERVERINFOFc.pAuthInfo = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "pAuthInfo", I_J);
 	COSERVERINFOFc.dwReserved2 = (*env)->GetFieldID(env, COSERVERINFOFc.clazz, "dwReserved2", "I");
 	COSERVERINFOFc.cached = 1;
 }
@@ -110,8 +110,8 @@ COSERVERINFO *getCOSERVERINFOFields(JNIEnv *env, jobject lpObject, COSERVERINFO
 {
 	if (!COSERVERINFOFc.cached) cacheCOSERVERINFOFields(env, lpObject);
 	lpStruct->dwReserved1 = (*env)->GetIntField(env, lpObject, COSERVERINFOFc.dwReserved1);
-	lpStruct->pwszName = (LPWSTR)(*env)->GetIntField(env, lpObject, COSERVERINFOFc.pwszName);
-	lpStruct->pAuthInfo = (COAUTHINFO *)(*env)->GetIntField(env, lpObject, COSERVERINFOFc.pAuthInfo);
+	lpStruct->pwszName = (LPWSTR)(*env)->GetIntLongField(env, lpObject, COSERVERINFOFc.pwszName);
+	lpStruct->pAuthInfo = (COAUTHINFO *)(*env)->GetIntLongField(env, lpObject, COSERVERINFOFc.pAuthInfo);
 	lpStruct->dwReserved2 = (*env)->GetIntField(env, lpObject, COSERVERINFOFc.dwReserved2);
 	return lpStruct;
 }
@@ -120,8 +120,8 @@ void setCOSERVERINFOFields(JNIEnv *env, jobject lpObject, COSERVERINFO *lpStruct
 {
 	if (!COSERVERINFOFc.cached) cacheCOSERVERINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, COSERVERINFOFc.dwReserved1, (jint)lpStruct->dwReserved1);
-	(*env)->SetIntField(env, lpObject, COSERVERINFOFc.pwszName, (jint)lpStruct->pwszName);
-	(*env)->SetIntField(env, lpObject, COSERVERINFOFc.pAuthInfo, (jint)lpStruct->pAuthInfo);
+	(*env)->SetIntLongField(env, lpObject, COSERVERINFOFc.pwszName, (jintLong)lpStruct->pwszName);
+	(*env)->SetIntLongField(env, lpObject, COSERVERINFOFc.pAuthInfo, (jintLong)lpStruct->pAuthInfo);
 	(*env)->SetIntField(env, lpObject, COSERVERINFOFc.dwReserved2, (jint)lpStruct->dwReserved2);
 }
 #endif
@@ -139,8 +139,8 @@ void cacheDISPPARAMSFields(JNIEnv *env, jobject lpObject)
 {
 	if (DISPPARAMSFc.cached) return;
 	DISPPARAMSFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	DISPPARAMSFc.rgvarg = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "rgvarg", "I");
-	DISPPARAMSFc.rgdispidNamedArgs = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "rgdispidNamedArgs", "I");
+	DISPPARAMSFc.rgvarg = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "rgvarg", I_J);
+	DISPPARAMSFc.rgdispidNamedArgs = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "rgdispidNamedArgs", I_J);
 	DISPPARAMSFc.cArgs = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "cArgs", "I");
 	DISPPARAMSFc.cNamedArgs = (*env)->GetFieldID(env, DISPPARAMSFc.clazz, "cNamedArgs", "I");
 	DISPPARAMSFc.cached = 1;
@@ -149,8 +149,8 @@ void cacheDISPPARAMSFields(JNIEnv *env, jobject lpObject)
 DISPPARAMS *getDISPPARAMSFields(JNIEnv *env, jobject lpObject, DISPPARAMS *lpStruct)
 {
 	if (!DISPPARAMSFc.cached) cacheDISPPARAMSFields(env, lpObject);
-	lpStruct->rgvarg = (VARIANTARG FAR *)(*env)->GetIntField(env, lpObject, DISPPARAMSFc.rgvarg);
-	lpStruct->rgdispidNamedArgs = (DISPID FAR *)(*env)->GetIntField(env, lpObject, DISPPARAMSFc.rgdispidNamedArgs);
+	lpStruct->rgvarg = (VARIANTARG FAR *)(*env)->GetIntLongField(env, lpObject, DISPPARAMSFc.rgvarg);
+	lpStruct->rgdispidNamedArgs = (DISPID FAR *)(*env)->GetIntLongField(env, lpObject, DISPPARAMSFc.rgdispidNamedArgs);
 	lpStruct->cArgs = (*env)->GetIntField(env, lpObject, DISPPARAMSFc.cArgs);
 	lpStruct->cNamedArgs = (*env)->GetIntField(env, lpObject, DISPPARAMSFc.cNamedArgs);
 	return lpStruct;
@@ -159,8 +159,8 @@ DISPPARAMS *getDISPPARAMSFields(JNIEnv *env, jobject lpObject, DISPPARAMS *lpStr
 void setDISPPARAMSFields(JNIEnv *env, jobject lpObject, DISPPARAMS *lpStruct)
 {
 	if (!DISPPARAMSFc.cached) cacheDISPPARAMSFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, DISPPARAMSFc.rgvarg, (jint)lpStruct->rgvarg);
-	(*env)->SetIntField(env, lpObject, DISPPARAMSFc.rgdispidNamedArgs, (jint)lpStruct->rgdispidNamedArgs);
+	(*env)->SetIntLongField(env, lpObject, DISPPARAMSFc.rgvarg, (jintLong)lpStruct->rgvarg);
+	(*env)->SetIntLongField(env, lpObject, DISPPARAMSFc.rgdispidNamedArgs, (jintLong)lpStruct->rgdispidNamedArgs);
 	(*env)->SetIntField(env, lpObject, DISPPARAMSFc.cArgs, (jint)lpStruct->cArgs);
 	(*env)->SetIntField(env, lpObject, DISPPARAMSFc.cNamedArgs, (jint)lpStruct->cNamedArgs);
 }
@@ -233,12 +233,12 @@ void cacheEXCEPINFOFields(JNIEnv *env, jobject lpObject)
 	EXCEPINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	EXCEPINFOFc.wCode = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "wCode", "S");
 	EXCEPINFOFc.wReserved = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "wReserved", "S");
-	EXCEPINFOFc.bstrSource = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrSource", "I");
-	EXCEPINFOFc.bstrDescription = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrDescription", "I");
-	EXCEPINFOFc.bstrHelpFile = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrHelpFile", "I");
+	EXCEPINFOFc.bstrSource = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrSource", I_J);
+	EXCEPINFOFc.bstrDescription = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrDescription", I_J);
+	EXCEPINFOFc.bstrHelpFile = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "bstrHelpFile", I_J);
 	EXCEPINFOFc.dwHelpContext = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "dwHelpContext", "I");
-	EXCEPINFOFc.pvReserved = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "pvReserved", "I");
-	EXCEPINFOFc.pfnDeferredFillIn = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "pfnDeferredFillIn", "I");
+	EXCEPINFOFc.pvReserved = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "pvReserved", I_J);
+	EXCEPINFOFc.pfnDeferredFillIn = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "pfnDeferredFillIn", I_J);
 	EXCEPINFOFc.scode = (*env)->GetFieldID(env, EXCEPINFOFc.clazz, "scode", "I");
 	EXCEPINFOFc.cached = 1;
 }
@@ -248,12 +248,12 @@ EXCEPINFO *getEXCEPINFOFields(JNIEnv *env, jobject lpObject, EXCEPINFO *lpStruct
 	if (!EXCEPINFOFc.cached) cacheEXCEPINFOFields(env, lpObject);
 	lpStruct->wCode = (*env)->GetShortField(env, lpObject, EXCEPINFOFc.wCode);
 	lpStruct->wReserved = (*env)->GetShortField(env, lpObject, EXCEPINFOFc.wReserved);
-	lpStruct->bstrSource = (BSTR)(*env)->GetIntField(env, lpObject, EXCEPINFOFc.bstrSource);
-	lpStruct->bstrDescription = (BSTR)(*env)->GetIntField(env, lpObject, EXCEPINFOFc.bstrDescription);
-	lpStruct->bstrHelpFile = (BSTR)(*env)->GetIntField(env, lpObject, EXCEPINFOFc.bstrHelpFile);
+	lpStruct->bstrSource = (BSTR)(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.bstrSource);
+	lpStruct->bstrDescription = (BSTR)(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.bstrDescription);
+	lpStruct->bstrHelpFile = (BSTR)(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.bstrHelpFile);
 	lpStruct->dwHelpContext = (*env)->GetIntField(env, lpObject, EXCEPINFOFc.dwHelpContext);
-	lpStruct->pvReserved = (void FAR *)(*env)->GetIntField(env, lpObject, EXCEPINFOFc.pvReserved);
-	lpStruct->pfnDeferredFillIn = (HRESULT (STDAPICALLTYPE FAR* )(struct tagEXCEPINFO FAR*))(*env)->GetIntField(env, lpObject, EXCEPINFOFc.pfnDeferredFillIn);
+	lpStruct->pvReserved = (void FAR *)(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.pvReserved);
+	lpStruct->pfnDeferredFillIn = (HRESULT (STDAPICALLTYPE FAR* )(struct tagEXCEPINFO FAR*))(*env)->GetIntLongField(env, lpObject, EXCEPINFOFc.pfnDeferredFillIn);
 	lpStruct->scode = (*env)->GetIntField(env, lpObject, EXCEPINFOFc.scode);
 	return lpStruct;
 }
@@ -263,12 +263,12 @@ void setEXCEPINFOFields(JNIEnv *env, jobject lpObject, EXCEPINFO *lpStruct)
 	if (!EXCEPINFOFc.cached) cacheEXCEPINFOFields(env, lpObject);
 	(*env)->SetShortField(env, lpObject, EXCEPINFOFc.wCode, (jshort)lpStruct->wCode);
 	(*env)->SetShortField(env, lpObject, EXCEPINFOFc.wReserved, (jshort)lpStruct->wReserved);
-	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.bstrSource, (jint)lpStruct->bstrSource);
-	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.bstrDescription, (jint)lpStruct->bstrDescription);
-	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.bstrHelpFile, (jint)lpStruct->bstrHelpFile);
+	(*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.bstrSource, (jintLong)lpStruct->bstrSource);
+	(*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.bstrDescription, (jintLong)lpStruct->bstrDescription);
+	(*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.bstrHelpFile, (jintLong)lpStruct->bstrHelpFile);
 	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.dwHelpContext, (jint)lpStruct->dwHelpContext);
-	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.pvReserved, (jint)lpStruct->pvReserved);
-	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.pfnDeferredFillIn, (jint)lpStruct->pfnDeferredFillIn);
+	(*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.pvReserved, (jintLong)lpStruct->pvReserved);
+	(*env)->SetIntLongField(env, lpObject, EXCEPINFOFc.pfnDeferredFillIn, (jintLong)lpStruct->pfnDeferredFillIn);
 	(*env)->SetIntField(env, lpObject, EXCEPINFOFc.scode, (jint)lpStruct->scode);
 }
 #endif
@@ -287,7 +287,7 @@ void cacheFORMATETCFields(JNIEnv *env, jobject lpObject)
 	if (FORMATETCFc.cached) return;
 	FORMATETCFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	FORMATETCFc.cfFormat = (*env)->GetFieldID(env, FORMATETCFc.clazz, "cfFormat", "I");
-	FORMATETCFc.ptd = (*env)->GetFieldID(env, FORMATETCFc.clazz, "ptd", "I");
+	FORMATETCFc.ptd = (*env)->GetFieldID(env, FORMATETCFc.clazz, "ptd", I_J);
 	FORMATETCFc.dwAspect = (*env)->GetFieldID(env, FORMATETCFc.clazz, "dwAspect", "I");
 	FORMATETCFc.lindex = (*env)->GetFieldID(env, FORMATETCFc.clazz, "lindex", "I");
 	FORMATETCFc.tymed = (*env)->GetFieldID(env, FORMATETCFc.clazz, "tymed", "I");
@@ -298,7 +298,7 @@ FORMATETC *getFORMATETCFields(JNIEnv *env, jobject lpObject, FORMATETC *lpStruct
 {
 	if (!FORMATETCFc.cached) cacheFORMATETCFields(env, lpObject);
 	lpStruct->cfFormat = (CLIPFORMAT)(*env)->GetIntField(env, lpObject, FORMATETCFc.cfFormat);
-	lpStruct->ptd = (DVTARGETDEVICE *)(*env)->GetIntField(env, lpObject, FORMATETCFc.ptd);
+	lpStruct->ptd = (DVTARGETDEVICE *)(*env)->GetIntLongField(env, lpObject, FORMATETCFc.ptd);
 	lpStruct->dwAspect = (*env)->GetIntField(env, lpObject, FORMATETCFc.dwAspect);
 	lpStruct->lindex = (*env)->GetIntField(env, lpObject, FORMATETCFc.lindex);
 	lpStruct->tymed = (*env)->GetIntField(env, lpObject, FORMATETCFc.tymed);
@@ -309,7 +309,7 @@ void setFORMATETCFields(JNIEnv *env, jobject lpObject, FORMATETC *lpStruct)
 {
 	if (!FORMATETCFc.cached) cacheFORMATETCFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, FORMATETCFc.cfFormat, (jint)lpStruct->cfFormat);
-	(*env)->SetIntField(env, lpObject, FORMATETCFc.ptd, (jint)lpStruct->ptd);
+	(*env)->SetIntLongField(env, lpObject, FORMATETCFc.ptd, (jintLong)lpStruct->ptd);
 	(*env)->SetIntField(env, lpObject, FORMATETCFc.dwAspect, (jint)lpStruct->dwAspect);
 	(*env)->SetIntField(env, lpObject, FORMATETCFc.lindex, (jint)lpStruct->lindex);
 	(*env)->SetIntField(env, lpObject, FORMATETCFc.tymed, (jint)lpStruct->tymed);
@@ -330,8 +330,8 @@ void cacheFUNCDESCFields(JNIEnv *env, jobject lpObject)
 	if (FUNCDESCFc.cached) return;
 	FUNCDESCFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	FUNCDESCFc.memid = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "memid", "I");
-	FUNCDESCFc.lprgscode = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "lprgscode", "I");
-	FUNCDESCFc.lprgelemdescParam = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "lprgelemdescParam", "I");
+	FUNCDESCFc.lprgscode = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "lprgscode", I_J);
+	FUNCDESCFc.lprgelemdescParam = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "lprgelemdescParam", I_J);
 	FUNCDESCFc.funckind = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "funckind", "I");
 	FUNCDESCFc.invkind = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "invkind", "I");
 	FUNCDESCFc.callconv = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "callconv", "I");
@@ -339,9 +339,9 @@ void cacheFUNCDESCFields(JNIEnv *env, jobject lpObject)
 	FUNCDESCFc.cParamsOpt = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "cParamsOpt", "S");
 	FUNCDESCFc.oVft = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "oVft", "S");
 	FUNCDESCFc.cScodes = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "cScodes", "S");
-	FUNCDESCFc.elemdescFunc_tdesc_union = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_tdesc_union", "I");
+	FUNCDESCFc.elemdescFunc_tdesc_union = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_tdesc_union", I_J);
 	FUNCDESCFc.elemdescFunc_tdesc_vt = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_tdesc_vt", "S");
-	FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_paramdesc_pparamdescex", "I");
+	FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_paramdesc_pparamdescex", I_J);
 	FUNCDESCFc.elemdescFunc_paramdesc_wParamFlags = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "elemdescFunc_paramdesc_wParamFlags", "S");
 	FUNCDESCFc.wFuncFlags = (*env)->GetFieldID(env, FUNCDESCFc.clazz, "wFuncFlags", "S");
 	FUNCDESCFc.cached = 1;
@@ -351,8 +351,8 @@ FUNCDESC *getFUNCDESCFields(JNIEnv *env, jobject lpObject, FUNCDESC *lpStruct)
 {
 	if (!FUNCDESCFc.cached) cacheFUNCDESCFields(env, lpObject);
 	lpStruct->memid = (MEMBERID)(*env)->GetIntField(env, lpObject, FUNCDESCFc.memid);
-	lpStruct->lprgscode = (SCODE FAR *)(*env)->GetIntField(env, lpObject, FUNCDESCFc.lprgscode);
-	lpStruct->lprgelemdescParam = (ELEMDESC FAR *)(*env)->GetIntField(env, lpObject, FUNCDESCFc.lprgelemdescParam);
+	lpStruct->lprgscode = (SCODE FAR *)(*env)->GetIntLongField(env, lpObject, FUNCDESCFc.lprgscode);
+	lpStruct->lprgelemdescParam = (ELEMDESC FAR *)(*env)->GetIntLongField(env, lpObject, FUNCDESCFc.lprgelemdescParam);
 	lpStruct->funckind = (FUNCKIND)(*env)->GetIntField(env, lpObject, FUNCDESCFc.funckind);
 	lpStruct->invkind = (INVOKEKIND)(*env)->GetIntField(env, lpObject, FUNCDESCFc.invkind);
 	lpStruct->callconv = (CALLCONV)(*env)->GetIntField(env, lpObject, FUNCDESCFc.callconv);
@@ -360,9 +360,9 @@ FUNCDESC *getFUNCDESCFields(JNIEnv *env, jobject lpObject, FUNCDESC *lpStruct)
 	lpStruct->cParamsOpt = (*env)->GetShortField(env, lpObject, FUNCDESCFc.cParamsOpt);
 	lpStruct->oVft = (*env)->GetShortField(env, lpObject, FUNCDESCFc.oVft);
 	lpStruct->cScodes = (*env)->GetShortField(env, lpObject, FUNCDESCFc.cScodes);
-	lpStruct->elemdescFunc.tdesc.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR* )(*env)->GetIntField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_union);
+	lpStruct->elemdescFunc.tdesc.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR* )(*env)->GetIntLongField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_union);
 	lpStruct->elemdescFunc.tdesc.vt = (*env)->GetShortField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_vt);
-	lpStruct->elemdescFunc.paramdesc.pparamdescex = (LPPARAMDESCEX)(*env)->GetIntField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex);
+	lpStruct->elemdescFunc.paramdesc.pparamdescex = (LPPARAMDESCEX)(*env)->GetIntLongField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex);
 	lpStruct->elemdescFunc.paramdesc.wParamFlags = (*env)->GetShortField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_wParamFlags);
 	lpStruct->wFuncFlags = (*env)->GetShortField(env, lpObject, FUNCDESCFc.wFuncFlags);
 	return lpStruct;
@@ -372,8 +372,8 @@ void setFUNCDESCFields(JNIEnv *env, jobject lpObject, FUNCDESC *lpStruct)
 {
 	if (!FUNCDESCFc.cached) cacheFUNCDESCFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, FUNCDESCFc.memid, (jint)lpStruct->memid);
-	(*env)->SetIntField(env, lpObject, FUNCDESCFc.lprgscode, (jint)lpStruct->lprgscode);
-	(*env)->SetIntField(env, lpObject, FUNCDESCFc.lprgelemdescParam, (jint)lpStruct->lprgelemdescParam);
+	(*env)->SetIntLongField(env, lpObject, FUNCDESCFc.lprgscode, (jintLong)lpStruct->lprgscode);
+	(*env)->SetIntLongField(env, lpObject, FUNCDESCFc.lprgelemdescParam, (jintLong)lpStruct->lprgelemdescParam);
 	(*env)->SetIntField(env, lpObject, FUNCDESCFc.funckind, (jint)lpStruct->funckind);
 	(*env)->SetIntField(env, lpObject, FUNCDESCFc.invkind, (jint)lpStruct->invkind);
 	(*env)->SetIntField(env, lpObject, FUNCDESCFc.callconv, (jint)lpStruct->callconv);
@@ -381,9 +381,9 @@ void setFUNCDESCFields(JNIEnv *env, jobject lpObject, FUNCDESC *lpStruct)
 	(*env)->SetShortField(env, lpObject, FUNCDESCFc.cParamsOpt, (jshort)lpStruct->cParamsOpt);
 	(*env)->SetShortField(env, lpObject, FUNCDESCFc.oVft, (jshort)lpStruct->oVft);
 	(*env)->SetShortField(env, lpObject, FUNCDESCFc.cScodes, (jshort)lpStruct->cScodes);
-	(*env)->SetIntField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_union, (jint)lpStruct->elemdescFunc.tdesc.lptdesc);
+	(*env)->SetIntLongField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_union, (jintLong)lpStruct->elemdescFunc.tdesc.lptdesc);
 	(*env)->SetShortField(env, lpObject, FUNCDESCFc.elemdescFunc_tdesc_vt, (jshort)lpStruct->elemdescFunc.tdesc.vt);
-	(*env)->SetIntField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex, (jint)lpStruct->elemdescFunc.paramdesc.pparamdescex);
+	(*env)->SetIntLongField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_pparamdescex, (jintLong)lpStruct->elemdescFunc.paramdesc.pparamdescex);
 	(*env)->SetShortField(env, lpObject, FUNCDESCFc.elemdescFunc_paramdesc_wParamFlags, (jshort)lpStruct->elemdescFunc.paramdesc.wParamFlags);
 	(*env)->SetShortField(env, lpObject, FUNCDESCFc.wFuncFlags, (jshort)lpStruct->wFuncFlags);
 }
@@ -534,7 +534,7 @@ OLECMDTEXT *getOLECMDTEXTFields(JNIEnv *env, jobject lpObject, OLECMDTEXT *lpStr
 	lpStruct->cwBuf = (*env)->GetIntField(env, lpObject, OLECMDTEXTFc.cwBuf);
 	{
 	jshortArray lpObject1 = (jshortArray)(*env)->GetObjectField(env, lpObject, OLECMDTEXTFc.rgwz);
-	(*env)->GetShortArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgwz) / 2, (jshort *)lpStruct->rgwz);
+	(*env)->GetShortArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgwz) / sizeof(jshort), (jshort *)lpStruct->rgwz);
 	}
 	return lpStruct;
 }
@@ -547,7 +547,7 @@ void setOLECMDTEXTFields(JNIEnv *env, jobject lpObject, OLECMDTEXT *lpStruct)
 	(*env)->SetIntField(env, lpObject, OLECMDTEXTFc.cwBuf, (jint)lpStruct->cwBuf);
 	{
 	jshortArray lpObject1 = (jshortArray)(*env)->GetObjectField(env, lpObject, OLECMDTEXTFc.rgwz);
-	(*env)->SetShortArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgwz) / 2, (jshort *)lpStruct->rgwz);
+	(*env)->SetShortArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgwz) / sizeof(jshort), (jshort *)lpStruct->rgwz);
 	}
 }
 #endif
@@ -567,8 +567,8 @@ void cacheOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject)
 	OLEINPLACEFRAMEINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	OLEINPLACEFRAMEINFOFc.cb = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "cb", "I");
 	OLEINPLACEFRAMEINFOFc.fMDIApp = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "fMDIApp", "I");
-	OLEINPLACEFRAMEINFOFc.hwndFrame = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "hwndFrame", "I");
-	OLEINPLACEFRAMEINFOFc.haccel = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "haccel", "I");
+	OLEINPLACEFRAMEINFOFc.hwndFrame = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "hwndFrame", I_J);
+	OLEINPLACEFRAMEINFOFc.haccel = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "haccel", I_J);
 	OLEINPLACEFRAMEINFOFc.cAccelEntries = (*env)->GetFieldID(env, OLEINPLACEFRAMEINFOFc.clazz, "cAccelEntries", "I");
 	OLEINPLACEFRAMEINFOFc.cached = 1;
 }
@@ -578,8 +578,8 @@ OLEINPLACEFRAMEINFO *getOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject,
 	if (!OLEINPLACEFRAMEINFOFc.cached) cacheOLEINPLACEFRAMEINFOFields(env, lpObject);
 	lpStruct->cb = (*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.cb);
 	lpStruct->fMDIApp = (*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.fMDIApp);
-	lpStruct->hwndFrame = (HWND)(*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.hwndFrame);
-	lpStruct->haccel = (HACCEL)(*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.haccel);
+	lpStruct->hwndFrame = (HWND)(*env)->GetIntLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.hwndFrame);
+	lpStruct->haccel = (HACCEL)(*env)->GetIntLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.haccel);
 	lpStruct->cAccelEntries = (*env)->GetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.cAccelEntries);
 	return lpStruct;
 }
@@ -589,8 +589,8 @@ void setOLEINPLACEFRAMEINFOFields(JNIEnv *env, jobject lpObject, OLEINPLACEFRAME
 	if (!OLEINPLACEFRAMEINFOFc.cached) cacheOLEINPLACEFRAMEINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.cb, (jint)lpStruct->cb);
 	(*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.fMDIApp, (jint)lpStruct->fMDIApp);
-	(*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.hwndFrame, (jint)lpStruct->hwndFrame);
-	(*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.haccel, (jint)lpStruct->haccel);
+	(*env)->SetIntLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.hwndFrame, (jintLong)lpStruct->hwndFrame);
+	(*env)->SetIntLongField(env, lpObject, OLEINPLACEFRAMEINFOFc.haccel, (jintLong)lpStruct->haccel);
 	(*env)->SetIntField(env, lpObject, OLEINPLACEFRAMEINFOFc.cAccelEntries, (jint)lpStruct->cAccelEntries);
 }
 #endif
@@ -608,7 +608,7 @@ void cacheSTATSTGFields(JNIEnv *env, jobject lpObject)
 {
 	if (STATSTGFc.cached) return;
 	STATSTGFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	STATSTGFc.pwcsName = (*env)->GetFieldID(env, STATSTGFc.clazz, "pwcsName", "I");
+	STATSTGFc.pwcsName = (*env)->GetFieldID(env, STATSTGFc.clazz, "pwcsName", I_J);
 	STATSTGFc.type = (*env)->GetFieldID(env, STATSTGFc.clazz, "type", "I");
 	STATSTGFc.cbSize = (*env)->GetFieldID(env, STATSTGFc.clazz, "cbSize", "J");
 	STATSTGFc.mtime_dwLowDateTime = (*env)->GetFieldID(env, STATSTGFc.clazz, "mtime_dwLowDateTime", "I");
@@ -631,7 +631,7 @@ void cacheSTATSTGFields(JNIEnv *env, jobject lpObject)
 STATSTG *getSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct)
 {
 	if (!STATSTGFc.cached) cacheSTATSTGFields(env, lpObject);
-	lpStruct->pwcsName = (LPWSTR)(*env)->GetIntField(env, lpObject, STATSTGFc.pwcsName);
+	lpStruct->pwcsName = (LPWSTR)(*env)->GetIntLongField(env, lpObject, STATSTGFc.pwcsName);
 	lpStruct->type = (*env)->GetIntField(env, lpObject, STATSTGFc.type);
 	lpStruct->cbSize.QuadPart = (*env)->GetLongField(env, lpObject, STATSTGFc.cbSize);
 	lpStruct->mtime.dwLowDateTime = (*env)->GetIntField(env, lpObject, STATSTGFc.mtime_dwLowDateTime);
@@ -657,7 +657,7 @@ STATSTG *getSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct)
 void setSTATSTGFields(JNIEnv *env, jobject lpObject, STATSTG *lpStruct)
 {
 	if (!STATSTGFc.cached) cacheSTATSTGFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, STATSTGFc.pwcsName, (jint)lpStruct->pwcsName);
+	(*env)->SetIntLongField(env, lpObject, STATSTGFc.pwcsName, (jintLong)lpStruct->pwcsName);
 	(*env)->SetIntField(env, lpObject, STATSTGFc.type, (jint)lpStruct->type);
 	(*env)->SetLongField(env, lpObject, STATSTGFc.cbSize, (jlong)lpStruct->cbSize.QuadPart);
 	(*env)->SetIntField(env, lpObject, STATSTGFc.mtime_dwLowDateTime, (jint)lpStruct->mtime.dwLowDateTime);
@@ -694,8 +694,8 @@ void cacheSTGMEDIUMFields(JNIEnv *env, jobject lpObject)
 	if (STGMEDIUMFc.cached) return;
 	STGMEDIUMFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	STGMEDIUMFc.tymed = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "tymed", "I");
-	STGMEDIUMFc.unionField = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "unionField", "I");
-	STGMEDIUMFc.pUnkForRelease = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "pUnkForRelease", "I");
+	STGMEDIUMFc.unionField = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "unionField", I_J);
+	STGMEDIUMFc.pUnkForRelease = (*env)->GetFieldID(env, STGMEDIUMFc.clazz, "pUnkForRelease", I_J);
 	STGMEDIUMFc.cached = 1;
 }
 
@@ -703,8 +703,8 @@ STGMEDIUM *getSTGMEDIUMFields(JNIEnv *env, jobject lpObject, STGMEDIUM *lpStruct
 {
 	if (!STGMEDIUMFc.cached) cacheSTGMEDIUMFields(env, lpObject);
 	lpStruct->tymed = (*env)->GetIntField(env, lpObject, STGMEDIUMFc.tymed);
-	lpStruct->hGlobal = (HGLOBAL)(*env)->GetIntField(env, lpObject, STGMEDIUMFc.unionField);
-	lpStruct->pUnkForRelease = (IUnknown *)(*env)->GetIntField(env, lpObject, STGMEDIUMFc.pUnkForRelease);
+	lpStruct->hGlobal = (HGLOBAL)(*env)->GetIntLongField(env, lpObject, STGMEDIUMFc.unionField);
+	lpStruct->pUnkForRelease = (IUnknown *)(*env)->GetIntLongField(env, lpObject, STGMEDIUMFc.pUnkForRelease);
 	return lpStruct;
 }
 
@@ -712,8 +712,8 @@ void setSTGMEDIUMFields(JNIEnv *env, jobject lpObject, STGMEDIUM *lpStruct)
 {
 	if (!STGMEDIUMFc.cached) cacheSTGMEDIUMFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, STGMEDIUMFc.tymed, (jint)lpStruct->tymed);
-	(*env)->SetIntField(env, lpObject, STGMEDIUMFc.unionField, (jint)lpStruct->hGlobal);
-	(*env)->SetIntField(env, lpObject, STGMEDIUMFc.pUnkForRelease, (jint)lpStruct->pUnkForRelease);
+	(*env)->SetIntLongField(env, lpObject, STGMEDIUMFc.unionField, (jintLong)lpStruct->hGlobal);
+	(*env)->SetIntLongField(env, lpObject, STGMEDIUMFc.pUnkForRelease, (jintLong)lpStruct->pUnkForRelease);
 }
 #endif
 
@@ -738,7 +738,7 @@ void cacheTYPEATTRFields(JNIEnv *env, jobject lpObject)
 	TYPEATTRFc.dwReserved = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "dwReserved", "I");
 	TYPEATTRFc.memidConstructor = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "memidConstructor", "I");
 	TYPEATTRFc.memidDestructor = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "memidDestructor", "I");
-	TYPEATTRFc.lpstrSchema = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "lpstrSchema", "I");
+	TYPEATTRFc.lpstrSchema = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "lpstrSchema", I_J);
 	TYPEATTRFc.cbSizeInstance = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "cbSizeInstance", "I");
 	TYPEATTRFc.typekind = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "typekind", "I");
 	TYPEATTRFc.cFuncs = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "cFuncs", "S");
@@ -749,7 +749,7 @@ void cacheTYPEATTRFields(JNIEnv *env, jobject lpObject)
 	TYPEATTRFc.wTypeFlags = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "wTypeFlags", "S");
 	TYPEATTRFc.wMajorVerNum = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "wMajorVerNum", "S");
 	TYPEATTRFc.wMinorVerNum = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "wMinorVerNum", "S");
-	TYPEATTRFc.tdescAlias_unionField = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "tdescAlias_unionField", "I");
+	TYPEATTRFc.tdescAlias_unionField = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "tdescAlias_unionField", I_J);
 	TYPEATTRFc.tdescAlias_vt = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "tdescAlias_vt", "S");
 	TYPEATTRFc.idldescType_dwReserved = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "idldescType_dwReserved", "I");
 	TYPEATTRFc.idldescType_wIDLFlags = (*env)->GetFieldID(env, TYPEATTRFc.clazz, "idldescType_wIDLFlags", "S");
@@ -770,7 +770,7 @@ TYPEATTR *getTYPEATTRFields(JNIEnv *env, jobject lpObject, TYPEATTR *lpStruct)
 	lpStruct->dwReserved = (*env)->GetIntField(env, lpObject, TYPEATTRFc.dwReserved);
 	lpStruct->memidConstructor = (*env)->GetIntField(env, lpObject, TYPEATTRFc.memidConstructor);
 	lpStruct->memidDestructor = (*env)->GetIntField(env, lpObject, TYPEATTRFc.memidDestructor);
-	lpStruct->lpstrSchema = (OLECHAR FAR *)(*env)->GetIntField(env, lpObject, TYPEATTRFc.lpstrSchema);
+	lpStruct->lpstrSchema = (OLECHAR FAR *)(*env)->GetIntLongField(env, lpObject, TYPEATTRFc.lpstrSchema);
 	lpStruct->cbSizeInstance = (*env)->GetIntField(env, lpObject, TYPEATTRFc.cbSizeInstance);
 	lpStruct->typekind = (*env)->GetIntField(env, lpObject, TYPEATTRFc.typekind);
 	lpStruct->cFuncs = (*env)->GetShortField(env, lpObject, TYPEATTRFc.cFuncs);
@@ -781,7 +781,7 @@ TYPEATTR *getTYPEATTRFields(JNIEnv *env, jobject lpObject, TYPEATTR *lpStruct)
 	lpStruct->wTypeFlags = (*env)->GetShortField(env, lpObject, TYPEATTRFc.wTypeFlags);
 	lpStruct->wMajorVerNum = (*env)->GetShortField(env, lpObject, TYPEATTRFc.wMajorVerNum);
 	lpStruct->wMinorVerNum = (*env)->GetShortField(env, lpObject, TYPEATTRFc.wMinorVerNum);
-	lpStruct->tdescAlias.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR *)(*env)->GetIntField(env, lpObject, TYPEATTRFc.tdescAlias_unionField);
+	lpStruct->tdescAlias.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR *)(*env)->GetIntLongField(env, lpObject, TYPEATTRFc.tdescAlias_unionField);
 	lpStruct->tdescAlias.vt = (*env)->GetShortField(env, lpObject, TYPEATTRFc.tdescAlias_vt);
 	lpStruct->idldescType.dwReserved = (*env)->GetIntField(env, lpObject, TYPEATTRFc.idldescType_dwReserved);
 	lpStruct->idldescType.wIDLFlags = (*env)->GetShortField(env, lpObject, TYPEATTRFc.idldescType_wIDLFlags);
@@ -802,7 +802,7 @@ void setTYPEATTRFields(JNIEnv *env, jobject lpObject, TYPEATTR *lpStruct)
 	(*env)->SetIntField(env, lpObject, TYPEATTRFc.dwReserved, (jint)lpStruct->dwReserved);
 	(*env)->SetIntField(env, lpObject, TYPEATTRFc.memidConstructor, (jint)lpStruct->memidConstructor);
 	(*env)->SetIntField(env, lpObject, TYPEATTRFc.memidDestructor, (jint)lpStruct->memidDestructor);
-	(*env)->SetIntField(env, lpObject, TYPEATTRFc.lpstrSchema, (jint)lpStruct->lpstrSchema);
+	(*env)->SetIntLongField(env, lpObject, TYPEATTRFc.lpstrSchema, (jintLong)lpStruct->lpstrSchema);
 	(*env)->SetIntField(env, lpObject, TYPEATTRFc.cbSizeInstance, (jint)lpStruct->cbSizeInstance);
 	(*env)->SetIntField(env, lpObject, TYPEATTRFc.typekind, (jint)lpStruct->typekind);
 	(*env)->SetShortField(env, lpObject, TYPEATTRFc.cFuncs, (jshort)lpStruct->cFuncs);
@@ -813,7 +813,7 @@ void setTYPEATTRFields(JNIEnv *env, jobject lpObject, TYPEATTR *lpStruct)
 	(*env)->SetShortField(env, lpObject, TYPEATTRFc.wTypeFlags, (jshort)lpStruct->wTypeFlags);
 	(*env)->SetShortField(env, lpObject, TYPEATTRFc.wMajorVerNum, (jshort)lpStruct->wMajorVerNum);
 	(*env)->SetShortField(env, lpObject, TYPEATTRFc.wMinorVerNum, (jshort)lpStruct->wMinorVerNum);
-	(*env)->SetIntField(env, lpObject, TYPEATTRFc.tdescAlias_unionField, (jint)lpStruct->tdescAlias.lptdesc);
+	(*env)->SetIntLongField(env, lpObject, TYPEATTRFc.tdescAlias_unionField, (jintLong)lpStruct->tdescAlias.lptdesc);
 	(*env)->SetShortField(env, lpObject, TYPEATTRFc.tdescAlias_vt, (jshort)lpStruct->tdescAlias.vt);
 	(*env)->SetIntField(env, lpObject, TYPEATTRFc.idldescType_dwReserved, (jint)lpStruct->idldescType.dwReserved);
 	(*env)->SetShortField(env, lpObject, TYPEATTRFc.idldescType_wIDLFlags, (jshort)lpStruct->idldescType.wIDLFlags);
@@ -834,11 +834,11 @@ void cacheVARDESCFields(JNIEnv *env, jobject lpObject)
 	if (VARDESCFc.cached) return;
 	VARDESCFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	VARDESCFc.memid = (*env)->GetFieldID(env, VARDESCFc.clazz, "memid", "I");
-	VARDESCFc.lpstrSchema = (*env)->GetFieldID(env, VARDESCFc.clazz, "lpstrSchema", "I");
+	VARDESCFc.lpstrSchema = (*env)->GetFieldID(env, VARDESCFc.clazz, "lpstrSchema", I_J);
 	VARDESCFc.oInst = (*env)->GetFieldID(env, VARDESCFc.clazz, "oInst", "I");
-	VARDESCFc.elemdescVar_tdesc_union = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_tdesc_union", "I");
+	VARDESCFc.elemdescVar_tdesc_union = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_tdesc_union", I_J);
 	VARDESCFc.elemdescVar_tdesc_vt = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_tdesc_vt", "S");
-	VARDESCFc.elemdescVar_paramdesc_pparamdescex = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_paramdesc_pparamdescex", "I");
+	VARDESCFc.elemdescVar_paramdesc_pparamdescex = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_paramdesc_pparamdescex", I_J);
 	VARDESCFc.elemdescVar_paramdesc_wParamFlags = (*env)->GetFieldID(env, VARDESCFc.clazz, "elemdescVar_paramdesc_wParamFlags", "S");
 	VARDESCFc.wVarFlags = (*env)->GetFieldID(env, VARDESCFc.clazz, "wVarFlags", "S");
 	VARDESCFc.varkind = (*env)->GetFieldID(env, VARDESCFc.clazz, "varkind", "I");
@@ -849,11 +849,11 @@ VARDESC *getVARDESCFields(JNIEnv *env, jobject lpObject, VARDESC *lpStruct)
 {
 	if (!VARDESCFc.cached) cacheVARDESCFields(env, lpObject);
 	lpStruct->memid = (*env)->GetIntField(env, lpObject, VARDESCFc.memid);
-	lpStruct->lpstrSchema = (OLECHAR FAR *)(*env)->GetIntField(env, lpObject, VARDESCFc.lpstrSchema);
+	lpStruct->lpstrSchema = (OLECHAR FAR *)(*env)->GetIntLongField(env, lpObject, VARDESCFc.lpstrSchema);
 	lpStruct->oInst = (*env)->GetIntField(env, lpObject, VARDESCFc.oInst);
-	lpStruct->elemdescVar.tdesc.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR *)(*env)->GetIntField(env, lpObject, VARDESCFc.elemdescVar_tdesc_union);
+	lpStruct->elemdescVar.tdesc.lptdesc = (struct FARSTRUCT tagTYPEDESC FAR *)(*env)->GetIntLongField(env, lpObject, VARDESCFc.elemdescVar_tdesc_union);
 	lpStruct->elemdescVar.tdesc.vt = (*env)->GetShortField(env, lpObject, VARDESCFc.elemdescVar_tdesc_vt);
-	lpStruct->elemdescVar.paramdesc.pparamdescex = (LPPARAMDESCEX)(*env)->GetIntField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_pparamdescex);
+	lpStruct->elemdescVar.paramdesc.pparamdescex = (LPPARAMDESCEX)(*env)->GetIntLongField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_pparamdescex);
 	lpStruct->elemdescVar.paramdesc.wParamFlags = (*env)->GetShortField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_wParamFlags);
 	lpStruct->wVarFlags = (*env)->GetShortField(env, lpObject, VARDESCFc.wVarFlags);
 	lpStruct->varkind = (*env)->GetIntField(env, lpObject, VARDESCFc.varkind);
@@ -864,11 +864,11 @@ void setVARDESCFields(JNIEnv *env, jobject lpObject, VARDESC *lpStruct)
 {
 	if (!VARDESCFc.cached) cacheVARDESCFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, VARDESCFc.memid, (jint)lpStruct->memid);
-	(*env)->SetIntField(env, lpObject, VARDESCFc.lpstrSchema, (jint)lpStruct->lpstrSchema);
+	(*env)->SetIntLongField(env, lpObject, VARDESCFc.lpstrSchema, (jintLong)lpStruct->lpstrSchema);
 	(*env)->SetIntField(env, lpObject, VARDESCFc.oInst, (jint)lpStruct->oInst);
-	(*env)->SetIntField(env, lpObject, VARDESCFc.elemdescVar_tdesc_union, (jint)lpStruct->elemdescVar.tdesc.lptdesc);
+	(*env)->SetIntLongField(env, lpObject, VARDESCFc.elemdescVar_tdesc_union, (jintLong)lpStruct->elemdescVar.tdesc.lptdesc);
 	(*env)->SetShortField(env, lpObject, VARDESCFc.elemdescVar_tdesc_vt, (jshort)lpStruct->elemdescVar.tdesc.vt);
-	(*env)->SetIntField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_pparamdescex, (jint)lpStruct->elemdescVar.paramdesc.pparamdescex);
+	(*env)->SetIntLongField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_pparamdescex, (jintLong)lpStruct->elemdescVar.paramdesc.pparamdescex);
 	(*env)->SetShortField(env, lpObject, VARDESCFc.elemdescVar_paramdesc_wParamFlags, (jshort)lpStruct->elemdescVar.paramdesc.wParamFlags);
 	(*env)->SetShortField(env, lpObject, VARDESCFc.wVarFlags, (jshort)lpStruct->wVarFlags);
 	(*env)->SetIntField(env, lpObject, VARDESCFc.varkind, (jint)lpStruct->varkind);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp
index 31f320b41d..4b69e95389 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip.cpp
@@ -16,9 +16,9 @@
 #define Gdip_NATIVE(func) Java_org_eclipse_swt_internal_gdip_Gdip_##func
 
 #ifndef NO_BitmapData_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, BitmapData_1delete_FUNC);
 	delete (BitmapData *)arg0;
@@ -27,56 +27,56 @@ JNIEXPORT void JNICALL Gdip_NATIVE(BitmapData_1delete)
 #endif
 
 #ifndef NO_BitmapData_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(BitmapData_1new)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL Gdip_NATIVE(BitmapData_1new)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(BitmapData_1new)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(BitmapData_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, BitmapData_1new_FUNC);
-	rc = (jint)new BitmapData();
+	rc = (jintLong)new BitmapData();
 	Gdip_NATIVE_EXIT(env, that, BitmapData_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Bitmap_1GetHBITMAP
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHBITMAP)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHBITMAP)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHBITMAP)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1GetHBITMAP_FUNC);
-	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail;
 	rc = (jint)((Bitmap*)arg0)->GetHBITMAP(*(Color*)arg1, (HBITMAP*)lparg2);
 fail:
-	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
+	if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0);
 	Gdip_NATIVE_EXIT(env, that, Bitmap_1GetHBITMAP_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Bitmap_1GetHICON
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHICON)(JNIEnv *env, jclass that, jint arg0, jintArray arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHICON)(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1GetHICON)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1GetHICON_FUNC);
-	if (arg1) if ((lparg1 = env->GetIntArrayElements(arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = env->GetIntLongArrayElements(arg1, NULL)) == NULL) goto fail;
 	rc = (jint)((Bitmap*)arg0)->GetHICON((HICON*)lparg1);
 fail:
-	if (arg1 && lparg1) env->ReleaseIntArrayElements(arg1, lparg1, 0);
+	if (arg1 && lparg1) env->ReleaseIntLongArrayElements(arg1, lparg1, 0);
 	Gdip_NATIVE_EXIT(env, that, Bitmap_1GetHICON_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Bitmap_1LockBits
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1LockBits)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1LockBits)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1LockBits)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1LockBits_FUNC);
@@ -87,9 +87,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1LockBits)
 #endif
 
 #ifndef NO_Bitmap_1UnlockBits
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1UnlockBits)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1UnlockBits)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1UnlockBits)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1UnlockBits_FUNC);
@@ -100,9 +100,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1UnlockBits)
 #endif
 
 #ifndef NO_Bitmap_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Bitmap_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Bitmap_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Bitmap_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1delete_FUNC);
 	delete (Bitmap *)arg0;
@@ -110,55 +110,91 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Bitmap_1delete)
 }
 #endif
 
-#ifndef NO_Bitmap_1new__I
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new__I)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new__I)
-	(JNIEnv *env, jclass that, jint arg0)
+#if (!defined(NO_Bitmap_1new__I) && !defined(JNI64)) || (!defined(NO_Bitmap_1new__J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__I)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__I)(JNIEnv *env, jclass that, jintLong arg0)
+#else
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__J)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__J)(JNIEnv *env, jclass that, jintLong arg0)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1new__I_FUNC);
-	rc = (jint)new Bitmap((HICON)arg0);
+#else
+	Gdip_NATIVE_ENTER(env, that, Bitmap_1new__J_FUNC);
+#endif
+	rc = (jintLong)new Bitmap((HICON)arg0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Bitmap_1new__I_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Bitmap_1new__J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Bitmap_1new__II
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO_Bitmap_1new__II) && !defined(JNI64)) || (!defined(NO_Bitmap_1new__JJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1new__II_FUNC);
-	rc = (jint)new Bitmap((HBITMAP)arg0, (HPALETTE)arg1);
+#else
+	Gdip_NATIVE_ENTER(env, that, Bitmap_1new__JJ_FUNC);
+#endif
+	rc = (jintLong)new Bitmap((HBITMAP)arg0, (HPALETTE)arg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Bitmap_1new__II_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Bitmap_1new__JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Bitmap_1new__IIIII
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new__IIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO_Bitmap_1new__IIIII) && !defined(JNI64)) || (!defined(NO_Bitmap_1new__IIIIJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintLong arg4);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintLong arg4)
+#else
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__IIIIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintLong arg4);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new__IIIIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintLong arg4)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1new__IIIII_FUNC);
-	rc = (jint)new Bitmap(arg0, arg1, arg2, (PixelFormat)arg3, (BYTE *)arg4);
+#else
+	Gdip_NATIVE_ENTER(env, that, Bitmap_1new__IIIIJ_FUNC);
+#endif
+	rc = (jintLong)new Bitmap(arg0, arg1, arg2, (PixelFormat)arg3, (BYTE *)arg4);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Bitmap_1new__IIIII_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Bitmap_1new__IIIIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Bitmap_1new___3CZ
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new___3CZ)(JNIEnv *env, jclass that, jcharArray arg0, jboolean arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Bitmap_1new___3CZ)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new___3CZ)(JNIEnv *env, jclass that, jcharArray arg0, jboolean arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Bitmap_1new___3CZ)
 	(JNIEnv *env, jclass that, jcharArray arg0, jboolean arg1)
 {
 	jchar *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Bitmap_1new___3CZ_FUNC);
 	if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)new Bitmap((WCHAR*)lparg0, arg1);
+	rc = (jintLong)new Bitmap((WCHAR*)lparg0, arg1);
 fail:
 	if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
 	Gdip_NATIVE_EXIT(env, that, Bitmap_1new___3CZ_FUNC);
@@ -167,22 +203,22 @@ fail:
 #endif
 
 #ifndef NO_Brush_1Clone
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1Clone)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1Clone)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Brush_1Clone)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Brush_1Clone)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Brush_1Clone_FUNC);
-	rc = (jint)((Brush *)arg0)->Clone();
+	rc = (jintLong)((Brush *)arg0)->Clone();
 	Gdip_NATIVE_EXIT(env, that, Brush_1Clone_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Brush_1GetType
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1GetType)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1GetType)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Brush_1GetType)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Brush_1GetType_FUNC);
@@ -206,9 +242,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(ColorPalette_1sizeof)
 #endif
 
 #ifndef NO_Color_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Color_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Color_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Color_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Color_1delete_FUNC);
 	delete (Color *)arg0;
@@ -217,22 +253,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Color_1delete)
 #endif
 
 #ifndef NO_Color_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Color_1new)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Color_1new)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Color_1new)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Color_1new)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Color_1new_FUNC);
-	rc = (jint)new Color((ARGB)arg0);
+	rc = (jintLong)new Color((ARGB)arg0);
 	Gdip_NATIVE_EXIT(env, that, Color_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_FontFamily_1GetFamilyName
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1GetFamilyName)(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jchar arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1GetFamilyName)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jchar arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1GetFamilyName)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jchar arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jchar arg2)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
@@ -247,9 +283,9 @@ fail:
 #endif
 
 #ifndef NO_FontFamily_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(FontFamily_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(FontFamily_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(FontFamily_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, FontFamily_1delete_FUNC);
 	delete (FontFamily *)arg0;
@@ -258,22 +294,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(FontFamily_1delete)
 #endif
 
 #ifndef NO_FontFamily_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1new)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL Gdip_NATIVE(FontFamily_1new)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(FontFamily_1new)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(FontFamily_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, FontFamily_1new_FUNC);
-	rc = (jint)new FontFamily();
+	rc = (jintLong)new FontFamily();
 	Gdip_NATIVE_EXIT(env, that, FontFamily_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Font_1GetFamily
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetFamily)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetFamily)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetFamily)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Font_1GetFamily_FUNC);
@@ -284,9 +320,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetFamily)
 #endif
 
 #ifndef NO_Font_1GetSize
-extern "C" JNIEXPORT jfloat JNICALL Gdip_NATIVE(Font_1GetSize)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jfloat JNICALL Gdip_NATIVE(Font_1GetSize)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jfloat JNICALL Gdip_NATIVE(Font_1GetSize)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jfloat rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Font_1GetSize_FUNC);
@@ -297,9 +333,9 @@ JNIEXPORT jfloat JNICALL Gdip_NATIVE(Font_1GetSize)
 #endif
 
 #ifndef NO_Font_1GetStyle
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetStyle)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetStyle)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetStyle)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Font_1GetStyle_FUNC);
@@ -310,9 +346,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1GetStyle)
 #endif
 
 #ifndef NO_Font_1IsAvailable
-extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Font_1IsAvailable)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Font_1IsAvailable)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jboolean JNICALL Gdip_NATIVE(Font_1IsAvailable)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Font_1IsAvailable_FUNC);
@@ -323,9 +359,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(Font_1IsAvailable)
 #endif
 
 #ifndef NO_Font_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Font_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Font_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Font_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Font_1delete_FUNC);
 	delete (Font *)arg0;
@@ -333,40 +369,64 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Font_1delete)
 }
 #endif
 
-#ifndef NO_Font_1new__II
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1new__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1new__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO_Font_1new__II) && !defined(JNI64)) || (!defined(NO_Font_1new__JJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Font_1new__II_FUNC);
-	rc = (jint)new Font((HDC)arg0, (HFONT)arg1);
+#else
+	Gdip_NATIVE_ENTER(env, that, Font_1new__JJ_FUNC);
+#endif
+	rc = (jintLong)new Font((HDC)arg0, (HFONT)arg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Font_1new__II_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Font_1new__JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Font_1new___3CFIII
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1new___3CFIII)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jint arg4);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Font_1new___3CFIII)
-	(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO_Font_1new___3CFIII) && !defined(JNI64)) || (!defined(NO_Font_1new___3CFIIJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new___3CFIII)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jintLong arg4);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new___3CFIII)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jintLong arg4)
+#else
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new___3CFIIJ)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jintLong arg4);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Font_1new___3CFIIJ)(JNIEnv *env, jclass that, jcharArray arg0, jfloat arg1, jint arg2, jint arg3, jintLong arg4)
+#endif
 {
 	jchar *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Font_1new___3CFIII_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Font_1new___3CFIIJ_FUNC);
+#endif
 	if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)new Font((const WCHAR *)lparg0, (REAL)arg1, (INT)arg2, (Unit)arg3, (const FontCollection *)arg4);
+	rc = (jintLong)new Font((const WCHAR *)lparg0, (REAL)arg1, (INT)arg2, (Unit)arg3, (const FontCollection *)arg4);
 fail:
 	if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Font_1new___3CFIII_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Font_1new___3CFIIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_GdiplusShutdown
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, GdiplusShutdown_FUNC);
 	GdiplusShutdown((ULONG_PTR)arg0);
@@ -375,20 +435,20 @@ JNIEXPORT void JNICALL Gdip_NATIVE(GdiplusShutdown)
 #endif
 
 #ifndef NO_GdiplusStartup
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartup)(JNIEnv *env, jclass that, jintArray arg0, jobject arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartup)(JNIEnv *env, jclass that, jintLongArray arg0, jobject arg1, jintLong arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartup)
-	(JNIEnv *env, jclass that, jintArray arg0, jobject arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLongArray arg0, jobject arg1, jintLong arg2)
 {
-	jint *lparg0=NULL;
+	jintLong *lparg0=NULL;
 	GdiplusStartupInput _arg1, *lparg1=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GdiplusStartup_FUNC);
-	if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
+	if (arg0) if ((lparg0 = env->GetIntLongArrayElements(arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getGdiplusStartupInputFields(env, arg1, &_arg1)) == NULL) goto fail;
 	rc = (jint)GdiplusStartup((ULONG_PTR *)lparg0, (const GdiplusStartupInput *)lparg1, (GdiplusStartupOutput *)arg2);
 fail:
 	if (arg1 && lparg1) setGdiplusStartupInputFields(env, arg1, lparg1);
-	if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, 0);
+	if (arg0 && lparg0) env->ReleaseIntLongArrayElements(arg0, lparg0, 0);
 	Gdip_NATIVE_EXIT(env, that, GdiplusStartup_FUNC);
 	return rc;
 }
@@ -408,9 +468,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GdiplusStartupInput_1sizeof)
 #endif
 
 #ifndef NO_GraphicsPath_1AddArc
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddArc)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddArc)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddArc)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1AddArc_FUNC);
@@ -421,9 +481,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddArc)
 #endif
 
 #ifndef NO_GraphicsPath_1AddBezier
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddBezier)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7, jfloat arg8);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddBezier)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7, jfloat arg8);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddBezier)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7, jfloat arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6, jfloat arg7, jfloat arg8)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1AddBezier_FUNC);
@@ -434,9 +494,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddBezier)
 #endif
 
 #ifndef NO_GraphicsPath_1AddLine
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddLine)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddLine)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddLine)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1AddLine_FUNC);
@@ -447,9 +507,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddLine)
 #endif
 
 #ifndef NO_GraphicsPath_1AddPath
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddPath)(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddPath)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddPath)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1AddPath_FUNC);
@@ -460,9 +520,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddPath)
 #endif
 
 #ifndef NO_GraphicsPath_1AddRectangle
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddRectangle)(JNIEnv *env, jclass that, jint arg0, jobject arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddRectangle)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddRectangle)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RectF _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -477,9 +537,9 @@ fail:
 #endif
 
 #ifndef NO_GraphicsPath_1AddString
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddString)(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jint arg4, jfloat arg5, jobject arg6, jint arg7);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddString)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jint arg4, jfloat arg5, jobject arg6, jintLong arg7);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1AddString)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jint arg4, jfloat arg5, jobject arg6, jint arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jint arg4, jfloat arg5, jobject arg6, jintLong arg7)
 {
 	jchar *lparg1=NULL;
 	PointF _arg6, *lparg6=NULL;
@@ -497,22 +557,22 @@ fail:
 #endif
 
 #ifndef NO_GraphicsPath_1Clone
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Clone)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Clone)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1Clone)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1Clone)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1Clone_FUNC);
-	rc = (jint)((GraphicsPath *)arg0)->Clone();
+	rc = (jintLong)((GraphicsPath *)arg0)->Clone();
 	Gdip_NATIVE_EXIT(env, that, GraphicsPath_1Clone_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GraphicsPath_1CloseFigure
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1CloseFigure)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1CloseFigure)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1CloseFigure)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1CloseFigure_FUNC);
@@ -523,9 +583,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1CloseFigure)
 #endif
 
 #ifndef NO_GraphicsPath_1Flatten
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Flatten)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Flatten)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloat arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Flatten)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloat arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1Flatten_FUNC);
@@ -536,9 +596,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Flatten)
 #endif
 
 #ifndef NO_GraphicsPath_1GetBounds
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetBounds)(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetBounds)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLong arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetBounds)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLong arg3)
 {
 	RectF _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -553,9 +613,9 @@ fail:
 #endif
 
 #ifndef NO_GraphicsPath_1GetLastPoint
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetLastPoint)(JNIEnv *env, jclass that, jint arg0, jobject arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetLastPoint)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetLastPoint)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	PointF _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -570,9 +630,9 @@ fail:
 #endif
 
 #ifndef NO_GraphicsPath_1GetPathTypes
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathTypes)(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathTypes)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathTypes)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -587,9 +647,9 @@ fail:
 #endif
 
 #ifndef NO_GraphicsPath_1GetPointCount
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPointCount)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPointCount)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPointCount)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1GetPointCount_FUNC);
@@ -600,9 +660,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPointCount)
 #endif
 
 #ifndef NO_GraphicsPath_1IsOutlineVisible
-extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsOutlineVisible)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3, jint arg4);
+extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsOutlineVisible)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jintLong arg3, jintLong arg4);
 JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsOutlineVisible)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jintLong arg3, jintLong arg4)
 {
 	jboolean rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1IsOutlineVisible_FUNC);
@@ -613,9 +673,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsOutlineVisible)
 #endif
 
 #ifndef NO_GraphicsPath_1IsVisible
-extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsVisible)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsVisible)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jintLong arg3);
 JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsVisible)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jintLong arg3)
 {
 	jboolean rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1IsVisible_FUNC);
@@ -626,9 +686,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(GraphicsPath_1IsVisible)
 #endif
 
 #ifndef NO_GraphicsPath_1SetFillMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1SetFillMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1SetFillMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1SetFillMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1SetFillMode_FUNC);
@@ -639,9 +699,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1SetFillMode)
 #endif
 
 #ifndef NO_GraphicsPath_1StartFigure
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1StartFigure)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1StartFigure)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1StartFigure)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1StartFigure_FUNC);
@@ -652,9 +712,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1StartFigure)
 #endif
 
 #ifndef NO_GraphicsPath_1Transform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Transform)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Transform)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Transform)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1Transform_FUNC);
@@ -665,9 +725,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1Transform)
 #endif
 
 #ifndef NO_GraphicsPath_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(GraphicsPath_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(GraphicsPath_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(GraphicsPath_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1delete_FUNC);
 	delete (GraphicsPath *)arg0;
@@ -676,22 +736,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(GraphicsPath_1delete)
 #endif
 
 #ifndef NO_GraphicsPath_1new__I
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1new__I)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1new__I)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1new__I)(JNIEnv *env, jclass that, jint arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1new__I)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1new__I_FUNC);
-	rc = (jint)new GraphicsPath((FillMode)arg0);
+	rc = (jintLong)new GraphicsPath((FillMode)arg0);
 	Gdip_NATIVE_EXIT(env, that, GraphicsPath_1new__I_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1DrawArc
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawArc_FUNC);
@@ -701,27 +761,39 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawArc)
 }
 #endif
 
-#ifndef NO_Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jint arg7)
+#if (!defined(NO_Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jobject arg5, jint arg6, jintLong arg7);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jobject arg5, jint arg6, jintLong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jobject arg5, jint arg6, jintLong arg7);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jobject arg5, jint arg6, jintLong arg7)
+#endif
 {
 	PointF _arg5, *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ_FUNC);
+#endif
 	if (arg5) if ((lparg5 = getPointFFields(env, arg5, &_arg5)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->DrawDriverString((const UINT16 *)arg1, arg2, (const Font *)arg3, (const Brush *)arg4, (const PointF *)lparg5, arg6, (const Matrix *)arg7);
 fail:
 	if (arg5 && lparg5) setPointFFields(env, arg5, lparg5);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1DrawEllipse
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawEllipse_FUNC);
@@ -731,40 +803,64 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawEllipse)
 }
 #endif
 
-#ifndef NO_Graphics_1DrawImage__IIII
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_Graphics_1DrawImage__IIII) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawImage__JJII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawImage__IIII_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawImage__JJII_FUNC);
+#endif
 	rc = (jint)((Graphics *)arg0)->DrawImage((Image *)arg1, (INT)arg2, (INT)arg3);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawImage__IIII_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawImage__JJII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+#if (!defined(NO_Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10)
+#endif
 {
 	Rect _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getRectFields(env, arg2, &_arg2)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->DrawImage((Image *)arg1, *(const Rect *)lparg2, (INT)arg3, (INT)arg4, (INT)arg5, (INT)arg6, (Unit)arg7, (ImageAttributes *)arg8, (DrawImageAbort)arg9, (VOID *)arg10);
 fail:
 	if (arg2 && lparg2) setRectFields(env, arg2, lparg2);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1DrawLine
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLine)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLine)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLine)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawLine_FUNC);
@@ -775,9 +871,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLine)
 #endif
 
 #ifndef NO_Graphics_1DrawPath
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPath)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPath)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPath)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawPath_FUNC);
@@ -788,9 +884,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPath)
 #endif
 
 #ifndef NO_Graphics_1DrawRectangle
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawRectangle)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawRectangle)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawRectangle)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawRectangle_FUNC);
@@ -800,50 +896,74 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawRectangle)
 }
 #endif
 
-#ifndef NO_Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
+#if (!defined(NO_Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5)
+#endif
 {
 	jchar *lparg1=NULL;
 	PointF _arg4, *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J_FUNC);
+#endif
 	if (arg1) if ((lparg1 = env->GetCharArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getPointFFields(env, arg4, &_arg4)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->DrawString((WCHAR *)lparg1, (int)arg2, (Font *)arg3, *lparg4, (Brush *)arg5);
 fail:
 	if (arg4 && lparg4) setPointFFields(env, arg4, lparg4);
 	if (arg1 && lparg1) env->ReleaseCharArrayElements(arg1, lparg1, 0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6)
+#if (!defined(NO_Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II) && !defined(JNI64)) || (!defined(NO_Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLong arg6);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLong arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLong arg6);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jintLong arg6)
+#endif
 {
 	jchar *lparg1=NULL;
 	PointF _arg4, *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ_FUNC);
+#endif
 	if (arg1) if ((lparg1 = env->GetCharArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getPointFFields(env, arg4, &_arg4)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->DrawString((WCHAR *)lparg1, (int)arg2, (Font *)arg3, *lparg4, (StringFormat *)arg5, (Brush *)arg6);
 fail:
 	if (arg4 && lparg4) setPointFFields(env, arg4, lparg4);
 	if (arg1 && lparg1) env->ReleaseCharArrayElements(arg1, lparg1, 0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1FillEllipse
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillEllipse)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillEllipse)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillEllipse)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1FillEllipse_FUNC);
@@ -854,9 +974,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillEllipse)
 #endif
 
 #ifndef NO_Graphics_1FillPath
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPath)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPath)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPath)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1FillPath_FUNC);
@@ -867,9 +987,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPath)
 #endif
 
 #ifndef NO_Graphics_1FillPie
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPie)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPie)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPie)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jfloat arg6, jfloat arg7)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1FillPie_FUNC);
@@ -880,9 +1000,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPie)
 #endif
 
 #ifndef NO_Graphics_1FillRectangle
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillRectangle)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillRectangle)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillRectangle)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1FillRectangle_FUNC);
@@ -893,9 +1013,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillRectangle)
 #endif
 
 #ifndef NO_Graphics_1Flush
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1Flush)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1Flush)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1Flush)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	Gdip_NATIVE_ENTER(env, that, Graphics_1Flush_FUNC);
 	((Graphics *)arg0)->Flush((FlushIntention)arg1);
@@ -904,9 +1024,9 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1Flush)
 #endif
 
 #ifndef NO_Graphics_1GetClip
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClip)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClip)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClip)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetClip_FUNC);
@@ -916,57 +1036,81 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClip)
 }
 #endif
 
-#ifndef NO_Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jint arg0, jobject arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2) && !defined(JNI64)) || (!defined(NO_Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
 	RectF _arg1, *lparg1=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getRectFFields(env, arg1, &_arg1)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->GetClipBounds(lparg1);
 fail:
 	if (arg1 && lparg1) setRectFFields(env, arg1, lparg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jint arg0, jobject arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2) && !defined(JNI64)) || (!defined(NO_Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
 {
 	Rect _arg1, *lparg1=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getRectFields(env, arg1, &_arg1)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->GetClipBounds(lparg1);
 fail:
 	if (arg1 && lparg1) setRectFields(env, arg1, lparg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1GetHDC
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetHDC)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetHDC)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Graphics_1GetHDC)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Graphics_1GetHDC)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetHDC_FUNC);
-	rc = (jint)((Graphics *)arg0)->GetHDC();
+	rc = (jintLong)((Graphics *)arg0)->GetHDC();
 	Gdip_NATIVE_EXIT(env, that, Graphics_1GetHDC_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1GetInterpolationMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetInterpolationMode)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetInterpolationMode)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetInterpolationMode)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetInterpolationMode_FUNC);
@@ -977,9 +1121,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetInterpolationMode)
 #endif
 
 #ifndef NO_Graphics_1GetSmoothingMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetSmoothingMode)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetSmoothingMode)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetSmoothingMode)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetSmoothingMode_FUNC);
@@ -990,9 +1134,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetSmoothingMode)
 #endif
 
 #ifndef NO_Graphics_1GetTextRenderingHint
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTextRenderingHint)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTextRenderingHint)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTextRenderingHint)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetTextRenderingHint_FUNC);
@@ -1003,9 +1147,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTextRenderingHint)
 #endif
 
 #ifndef NO_Graphics_1GetTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTransform)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTransform)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTransform)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1GetTransform_FUNC);
@@ -1016,9 +1160,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetTransform)
 #endif
 
 #ifndef NO_Graphics_1GetVisibleClipBounds
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetVisibleClipBounds)(JNIEnv *env, jclass that, jint arg0, jobject arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetVisibleClipBounds)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1GetVisibleClipBounds)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	Rect _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -1032,16 +1176,24 @@ fail:
 }
 #endif
 
-#ifndef NO_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jobject arg6);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jobject arg6)
+#if (!defined(NO_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2) && !defined(JNI64)) || (!defined(NO_Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jobject arg6);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jobject arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jobject arg6);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jintLong arg5, jobject arg6)
+#endif
 {
 	jchar *lparg1=NULL;
 	PointF _arg4, *lparg4=NULL;
 	RectF _arg6, *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#endif
 	if (arg1) if ((lparg1 = env->GetCharArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getPointFFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = getRectFFields(env, arg6, &_arg6)) == NULL) goto fail;
@@ -1050,21 +1202,33 @@ fail:
 	if (arg6 && lparg6) setRectFFields(env, arg6, lparg6);
 	if (arg4 && lparg4) setPointFFields(env, arg4, lparg4);
 	if (arg1 && lparg1) env->ReleaseCharArrayElements(arg1, lparg1, 0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jobject arg5);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+#if (!defined(NO_Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2) && !defined(JNI64)) || (!defined(NO_Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jobject arg5);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jobject arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jobject arg5);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jintLong arg3, jobject arg4, jobject arg5)
+#endif
 {
 	jchar *lparg1=NULL;
 	PointF _arg4, *lparg4=NULL;
 	RectF _arg5, *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#endif
 	if (arg1) if ((lparg1 = env->GetCharArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getPointFFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = getRectFFields(env, arg5, &_arg5)) == NULL) goto fail;
@@ -1073,15 +1237,19 @@ fail:
 	if (arg5 && lparg5) setRectFFields(env, arg5, lparg5);
 	if (arg4 && lparg4) setPointFFields(env, arg4, lparg4);
 	if (arg1 && lparg1) env->ReleaseCharArrayElements(arg1, lparg1, 0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1ReleaseHDC
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1ReleaseHDC)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1ReleaseHDC)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1ReleaseHDC)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	Gdip_NATIVE_ENTER(env, that, Graphics_1ReleaseHDC_FUNC);
 	((Graphics *)arg0)->ReleaseHDC((HDC)arg1);
@@ -1090,9 +1258,9 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1ReleaseHDC)
 #endif
 
 #ifndef NO_Graphics_1ResetClip
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ResetClip)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ResetClip)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ResetClip)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1ResetClip_FUNC);
@@ -1103,9 +1271,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ResetClip)
 #endif
 
 #ifndef NO_Graphics_1Restore
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Restore)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Restore)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Restore)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1Restore_FUNC);
@@ -1116,9 +1284,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Restore)
 #endif
 
 #ifndef NO_Graphics_1Save
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Save)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Save)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Save)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1Save_FUNC);
@@ -1129,9 +1297,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1Save)
 #endif
 
 #ifndef NO_Graphics_1ScaleTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1ScaleTransform_FUNC);
@@ -1141,66 +1309,114 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1ScaleTransform)
 }
 #endif
 
-#ifndef NO_Graphics_1SetClip__III
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_Graphics_1SetClip__III) && !defined(JNI64)) || (!defined(NO_Graphics_1SetClip__JJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__III_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__JJI_FUNC);
+#endif
 	rc = (jint)((Graphics *)arg0)->SetClip((Region *)arg1, (CombineMode)arg2);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__III_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__JJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I) && !defined(JNI64)) || (!defined(NO_Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	Rect _arg1, *lparg1=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getRectFields(env, arg1, &_arg1)) == NULL) goto fail;
 	rc = (jint)((Graphics *)arg0)->SetClip(*(Rect *)lparg1, (CombineMode)arg2);
 fail:
 	if (arg1 && lparg1) setRectFields(env, arg1, lparg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1SetClipPath__II
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO_Graphics_1SetClipPath__II) && !defined(JNI64)) || (!defined(NO_Graphics_1SetClipPath__JJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__II_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__JJ_FUNC);
+#endif
 	rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__II_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_Graphics_1SetClipPath__III
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_Graphics_1SetClipPath__III) && !defined(JNI64)) || (!defined(NO_Graphics_1SetClipPath__JJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetClipPath__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__III_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Graphics_1SetClipPath__JJI_FUNC);
+#endif
 	rc = (jint)((Graphics *)arg0)->SetClip((GraphicsPath *)arg1, (CombineMode)arg2);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__III_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Graphics_1SetClipPath__JJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1SetCompositingQuality
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetCompositingQuality_FUNC);
@@ -1211,9 +1427,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetCompositingQuality)
 #endif
 
 #ifndef NO_Graphics_1SetInterpolationMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetInterpolationMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetInterpolationMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetInterpolationMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetInterpolationMode_FUNC);
@@ -1224,9 +1440,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetInterpolationMode)
 #endif
 
 #ifndef NO_Graphics_1SetPageUnit
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPageUnit)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPageUnit)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPageUnit)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetPageUnit_FUNC);
@@ -1237,9 +1453,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPageUnit)
 #endif
 
 #ifndef NO_Graphics_1SetPixelOffsetMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPixelOffsetMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPixelOffsetMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPixelOffsetMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetPixelOffsetMode_FUNC);
@@ -1250,9 +1466,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetPixelOffsetMode)
 #endif
 
 #ifndef NO_Graphics_1SetSmoothingMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetSmoothingMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetSmoothingMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetSmoothingMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetSmoothingMode_FUNC);
@@ -1263,9 +1479,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetSmoothingMode)
 #endif
 
 #ifndef NO_Graphics_1SetTextRenderingHint
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTextRenderingHint)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTextRenderingHint)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTextRenderingHint)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetTextRenderingHint_FUNC);
@@ -1276,9 +1492,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTextRenderingHint)
 #endif
 
 #ifndef NO_Graphics_1SetTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTransform)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTransform)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTransform)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1SetTransform_FUNC);
@@ -1289,9 +1505,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1SetTransform)
 #endif
 
 #ifndef NO_Graphics_1TranslateTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1TranslateTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1TranslateTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1TranslateTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1TranslateTransform_FUNC);
@@ -1302,9 +1518,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1TranslateTransform)
 #endif
 
 #ifndef NO_Graphics_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Graphics_1delete_FUNC);
 	delete (Graphics *)arg0;
@@ -1313,22 +1529,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Graphics_1delete)
 #endif
 
 #ifndef NO_Graphics_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1new)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Graphics_1new)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Graphics_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Graphics_1new_FUNC);
-	rc = (jint)new Graphics((HDC)arg0);
+	rc = (jintLong)new Graphics((HDC)arg0);
 	Gdip_NATIVE_EXIT(env, that, Graphics_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_HatchBrush_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(HatchBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(HatchBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(HatchBrush_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, HatchBrush_1delete_FUNC);
 	delete (HatchBrush *)arg0;
@@ -1337,22 +1553,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(HatchBrush_1delete)
 #endif
 
 #ifndef NO_HatchBrush_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(HatchBrush_1new)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-JNIEXPORT jint JNICALL Gdip_NATIVE(HatchBrush_1new)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(HatchBrush_1new)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(HatchBrush_1new)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, HatchBrush_1new_FUNC);
-	rc = (jint)new HatchBrush((HatchStyle)arg0, *(Color *)arg1, *(Color *)arg2);
+	rc = (jintLong)new HatchBrush((HatchStyle)arg0, *(Color *)arg1, *(Color *)arg2);
 	Gdip_NATIVE_EXIT(env, that, HatchBrush_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_ImageAttributes_1SetColorMatrix
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetColorMatrix)(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetColorMatrix)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetColorMatrix)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2, jint arg3)
 {
 	jfloat *lparg1=NULL;
 	jint rc = 0;
@@ -1367,9 +1583,9 @@ fail:
 #endif
 
 #ifndef NO_ImageAttributes_1SetWrapMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetWrapMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetWrapMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetWrapMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, ImageAttributes_1SetWrapMode_FUNC);
@@ -1380,9 +1596,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1SetWrapMode)
 #endif
 
 #ifndef NO_ImageAttributes_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(ImageAttributes_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(ImageAttributes_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(ImageAttributes_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, ImageAttributes_1delete_FUNC);
 	delete (ImageAttributes *)arg0;
@@ -1391,22 +1607,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(ImageAttributes_1delete)
 #endif
 
 #ifndef NO_ImageAttributes_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1new)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL Gdip_NATIVE(ImageAttributes_1new)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(ImageAttributes_1new)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(ImageAttributes_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, ImageAttributes_1new_FUNC);
-	rc = (jint)new ImageAttributes();
+	rc = (jintLong)new ImageAttributes();
 	Gdip_NATIVE_EXIT(env, that, ImageAttributes_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Image_1GetHeight
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetHeight)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetHeight)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetHeight)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Image_1GetHeight_FUNC);
@@ -1417,9 +1633,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetHeight)
 #endif
 
 #ifndef NO_Image_1GetLastStatus
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetLastStatus)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetLastStatus)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetLastStatus)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Image_1GetLastStatus_FUNC);
@@ -1430,9 +1646,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetLastStatus)
 #endif
 
 #ifndef NO_Image_1GetPalette
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPalette)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPalette)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPalette)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Image_1GetPalette_FUNC);
@@ -1443,9 +1659,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPalette)
 #endif
 
 #ifndef NO_Image_1GetPaletteSize
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPaletteSize)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPaletteSize)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPaletteSize)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Image_1GetPaletteSize_FUNC);
@@ -1456,9 +1672,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPaletteSize)
 #endif
 
 #ifndef NO_Image_1GetPixelFormat
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPixelFormat)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPixelFormat)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPixelFormat)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Image_1GetPixelFormat_FUNC);
@@ -1469,9 +1685,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetPixelFormat)
 #endif
 
 #ifndef NO_Image_1GetWidth
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Image_1GetWidth_FUNC);
@@ -1482,9 +1698,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Image_1GetWidth)
 #endif
 
 #ifndef NO_LinearGradientBrush_1ResetTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1ResetTransform_FUNC);
@@ -1495,9 +1711,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ResetTransform)
 #endif
 
 #ifndef NO_LinearGradientBrush_1ScaleTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1ScaleTransform_FUNC);
@@ -1508,9 +1724,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1ScaleTransform)
 #endif
 
 #ifndef NO_LinearGradientBrush_1SetWrapMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1SetWrapMode_FUNC);
@@ -1521,9 +1737,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetWrapMode)
 #endif
 
 #ifndef NO_LinearGradientBrush_1TranslateTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1TranslateTransform_FUNC);
@@ -1534,9 +1750,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1TranslateTransform)
 #endif
 
 #ifndef NO_LinearGradientBrush_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1delete_FUNC);
 	delete (LinearGradientBrush *)arg0;
@@ -1545,17 +1761,17 @@ JNIEXPORT void JNICALL Gdip_NATIVE(LinearGradientBrush_1delete)
 #endif
 
 #ifndef NO_LinearGradientBrush_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1new)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jint arg3);
-JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1new)
-	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jint arg2, jint arg3)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(LinearGradientBrush_1new)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jintLong arg3);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(LinearGradientBrush_1new)
+	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jintLong arg3)
 {
 	PointF _arg0, *lparg0=NULL;
 	PointF _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1new_FUNC);
 	if (arg0) if ((lparg0 = getPointFFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getPointFFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)new LinearGradientBrush(*lparg0, *lparg1, *(Color *)arg2, *(Color *)arg3);
+	rc = (jintLong)new LinearGradientBrush(*lparg0, *lparg1, *(Color *)arg2, *(Color *)arg3);
 fail:
 	if (arg1 && lparg1) setPointFFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setPointFFields(env, arg0, lparg0);
@@ -1565,9 +1781,9 @@ fail:
 #endif
 
 #ifndef NO_Matrix_1GetElements
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1GetElements)(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1GetElements)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1GetElements)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1)
 {
 	jfloat *lparg1=NULL;
 	jint rc = 0;
@@ -1582,9 +1798,9 @@ fail:
 #endif
 
 #ifndef NO_Matrix_1Invert
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Invert)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Invert)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Invert)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1Invert_FUNC);
@@ -1595,9 +1811,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Invert)
 #endif
 
 #ifndef NO_Matrix_1IsIdentity
-extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Matrix_1IsIdentity)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Matrix_1IsIdentity)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jboolean JNICALL Gdip_NATIVE(Matrix_1IsIdentity)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1IsIdentity_FUNC);
@@ -1608,9 +1824,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(Matrix_1IsIdentity)
 #endif
 
 #ifndef NO_Matrix_1Multiply
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Multiply)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Multiply)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Multiply)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1Multiply_FUNC);
@@ -1621,9 +1837,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Multiply)
 #endif
 
 #ifndef NO_Matrix_1Rotate
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Rotate)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Rotate)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Rotate)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1Rotate_FUNC);
@@ -1634,9 +1850,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Rotate)
 #endif
 
 #ifndef NO_Matrix_1Scale
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Scale)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Scale)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Scale)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1Scale_FUNC);
@@ -1647,9 +1863,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Scale)
 #endif
 
 #ifndef NO_Matrix_1SetElements
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1SetElements)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1SetElements)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1SetElements)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5, jfloat arg6)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1SetElements_FUNC);
@@ -1660,9 +1876,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1SetElements)
 #endif
 
 #ifndef NO_Matrix_1Shear
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Shear)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Shear)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Shear)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1Shear_FUNC);
@@ -1672,27 +1888,39 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Shear)
 }
 #endif
 
-#ifndef NO_Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I) && !defined(JNI64)) || (!defined(NO_Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	PointF _arg1, *lparg1=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getPointFFields(env, arg1, &_arg1)) == NULL) goto fail;
 	rc = (jint)((Matrix *)arg0)->TransformPoints(lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setPointFFields(env, arg1, lparg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Matrix_1Translate
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Translate)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Translate)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Translate)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1Translate_FUNC);
@@ -1703,9 +1931,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1Translate)
 #endif
 
 #ifndef NO_Matrix_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Matrix_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Matrix_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Matrix_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Matrix_1delete_FUNC);
 	delete (Matrix *)arg0;
@@ -1714,48 +1942,72 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Matrix_1delete)
 #endif
 
 #ifndef NO_Matrix_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1new)(JNIEnv *env, jclass that, jfloat arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1new)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Matrix_1new)(JNIEnv *env, jclass that, jfloat arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Matrix_1new)
 	(JNIEnv *env, jclass that, jfloat arg0, jfloat arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Matrix_1new_FUNC);
-	rc = (jint)new Matrix((REAL)arg0, (REAL)arg1, (REAL)arg2, (REAL)arg3, (REAL)arg4, (REAL)arg5);
+	rc = (jintLong)new Matrix((REAL)arg0, (REAL)arg1, (REAL)arg2, (REAL)arg3, (REAL)arg4, (REAL)arg5);
 	Gdip_NATIVE_EXIT(env, that, Matrix_1new_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I)(JNIEnv *env, jclass that, jobject arg0, jint arg1);
-JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1);
+JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1);
+JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
 {
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J_FUNC);
+#endif
 	if (arg0) setBitmapDataFields(env, arg0, (BitmapData *)arg1);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2);
-JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2);
+JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2);
+JNIEXPORT void JNICALL Gdip_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	ColorPalette _arg0, *lparg0=NULL;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II_FUNC);
+#else
+	Gdip_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getColorPaletteFields(env, arg0, &_arg0)) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID*)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setColorPaletteFields(env, arg0, lparg0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO_PathGradientBrush_1SetCenterColor
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterColor)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterColor)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterColor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetCenterColor_FUNC);
@@ -1766,9 +2018,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterColor)
 #endif
 
 #ifndef NO_PathGradientBrush_1SetCenterPoint
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterPoint)(JNIEnv *env, jclass that, jint arg0, jobject arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterPoint)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetCenterPoint)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	PointF _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -1783,9 +2035,9 @@ fail:
 #endif
 
 #ifndef NO_PathGradientBrush_1SetGraphicsPath
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetGraphicsPath_FUNC);
@@ -1796,9 +2048,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetGraphicsPath)
 #endif
 
 #ifndef NO_PathGradientBrush_1SetWrapMode
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetWrapMode_FUNC);
@@ -1809,9 +2061,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetWrapMode)
 #endif
 
 #ifndef NO_PathGradientBrush_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1delete_FUNC);
 	delete (PathGradientBrush *)arg0;
@@ -1820,35 +2072,35 @@ JNIEXPORT void JNICALL Gdip_NATIVE(PathGradientBrush_1delete)
 #endif
 
 #ifndef NO_PathGradientBrush_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1new)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(PathGradientBrush_1new)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(PathGradientBrush_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1new_FUNC);
-	rc = (jint)new PathGradientBrush((GraphicsPath *)arg0);
+	rc = (jintLong)new PathGradientBrush((GraphicsPath *)arg0);
 	Gdip_NATIVE_EXIT(env, that, PathGradientBrush_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Pen_1GetBrush
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1GetBrush)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1GetBrush)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Pen_1GetBrush)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Pen_1GetBrush)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1GetBrush_FUNC);
-	rc = (jint)((Pen *)arg0)->GetBrush();
+	rc = (jintLong)((Pen *)arg0)->GetBrush();
 	Gdip_NATIVE_EXIT(env, that, Pen_1GetBrush_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Pen_1SetBrush
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetBrush)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetBrush)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetBrush)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetBrush_FUNC);
@@ -1859,9 +2111,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetBrush)
 #endif
 
 #ifndef NO_Pen_1SetDashOffset
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashOffset)(JNIEnv *env, jclass that, jint arg0, jfloat arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashOffset)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashOffset)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetDashOffset_FUNC);
@@ -1872,9 +2124,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashOffset)
 #endif
 
 #ifndef NO_Pen_1SetDashPattern
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashPattern)(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashPattern)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashPattern)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2)
 {
 	jfloat *lparg1=NULL;
 	jint rc = 0;
@@ -1889,9 +2141,9 @@ fail:
 #endif
 
 #ifndef NO_Pen_1SetDashStyle
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashStyle)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashStyle)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashStyle)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetDashStyle_FUNC);
@@ -1902,9 +2154,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetDashStyle)
 #endif
 
 #ifndef NO_Pen_1SetLineCap
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineCap)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineCap)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineCap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetLineCap_FUNC);
@@ -1915,9 +2167,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineCap)
 #endif
 
 #ifndef NO_Pen_1SetLineJoin
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineJoin)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineJoin)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineJoin)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetLineJoin_FUNC);
@@ -1928,9 +2180,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetLineJoin)
 #endif
 
 #ifndef NO_Pen_1SetMiterLimit
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetMiterLimit)(JNIEnv *env, jclass that, jint arg0, jfloat arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetMiterLimit)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetMiterLimit)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetMiterLimit_FUNC);
@@ -1941,9 +2193,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetMiterLimit)
 #endif
 
 #ifndef NO_Pen_1SetWidth
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetWidth)(JNIEnv *env, jclass that, jint arg0, jfloat arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetWidth)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetWidth)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1SetWidth_FUNC);
@@ -1954,9 +2206,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1SetWidth)
 #endif
 
 #ifndef NO_Pen_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Pen_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Pen_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Pen_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Pen_1delete_FUNC);
 	delete (Pen *)arg0;
@@ -1965,22 +2217,22 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Pen_1delete)
 #endif
 
 #ifndef NO_Pen_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1new)(JNIEnv *env, jclass that, jint arg0, jfloat arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Pen_1new)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Pen_1new)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Pen_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Pen_1new_FUNC);
-	rc = (jint)new Pen((Brush *)arg0, (REAL)arg1);
+	rc = (jintLong)new Pen((Brush *)arg0, (REAL)arg1);
 	Gdip_NATIVE_EXIT(env, that, Pen_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Point_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Point_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Point_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Point_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Point_1delete_FUNC);
 	delete (Point *)arg0;
@@ -1989,35 +2241,35 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Point_1delete)
 #endif
 
 #ifndef NO_Point_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Point_1new)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Point_1new)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Point_1new)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Point_1new)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Point_1new_FUNC);
-	rc = (jint)new Point(arg0, arg1);
+	rc = (jintLong)new Point(arg0, arg1);
 	Gdip_NATIVE_EXIT(env, that, Point_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Region_1GetHRGN
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1GetHRGN)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1GetHRGN)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1GetHRGN)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1GetHRGN)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Region_1GetHRGN_FUNC);
-	rc = (jint)((Region *)arg0)->GetHRGN((Graphics *)arg1);
+	rc = (jintLong)((Region *)arg0)->GetHRGN((Graphics *)arg1);
 	Gdip_NATIVE_EXIT(env, that, Region_1GetHRGN_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_Region_1IsInfinite
-extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Region_1IsInfinite)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jboolean JNICALL Gdip_NATIVE(Region_1IsInfinite)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jboolean JNICALL Gdip_NATIVE(Region_1IsInfinite)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Region_1IsInfinite_FUNC);
@@ -2028,9 +2280,9 @@ JNIEXPORT jboolean JNICALL Gdip_NATIVE(Region_1IsInfinite)
 #endif
 
 #ifndef NO_Region_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Region_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(Region_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(Region_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, Region_1delete_FUNC);
 	delete (Region *)arg0;
@@ -2039,48 +2291,60 @@ JNIEXPORT void JNICALL Gdip_NATIVE(Region_1delete)
 #endif
 
 #ifndef NO_Region_1new__
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1new__)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1new__)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Region_1new___FUNC);
-	rc = (jint)new Region();
+	rc = (jintLong)new Region();
 	Gdip_NATIVE_EXIT(env, that, Region_1new___FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_Region_1new__I
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1new__I)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1new__I)
-	(JNIEnv *env, jclass that, jint arg0)
+#if (!defined(NO_Region_1new__I) && !defined(JNI64)) || (!defined(NO_Region_1new__J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__I)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__I)(JNIEnv *env, jclass that, jintLong arg0)
+#else
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__J)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1new__J)(JNIEnv *env, jclass that, jintLong arg0)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	Gdip_NATIVE_ENTER(env, that, Region_1new__I_FUNC);
-	rc = (jint)new Region((HRGN)arg0);
+#else
+	Gdip_NATIVE_ENTER(env, that, Region_1new__J_FUNC);
+#endif
+	rc = (jintLong)new Region((HRGN)arg0);
+#ifndef JNI64
 	Gdip_NATIVE_EXIT(env, that, Region_1new__I_FUNC);
+#else
+	Gdip_NATIVE_EXIT(env, that, Region_1new__J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Region_1newGraphicsPath
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1newGraphicsPath)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Region_1newGraphicsPath)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1newGraphicsPath)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(Region_1newGraphicsPath)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, Region_1newGraphicsPath_FUNC);
-	rc = (jint)new Region((GraphicsPath*)arg0);
+	rc = (jintLong)new Region((GraphicsPath*)arg0);
 	Gdip_NATIVE_EXIT(env, that, Region_1newGraphicsPath_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_SolidBrush_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(SolidBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(SolidBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(SolidBrush_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, SolidBrush_1delete_FUNC);
 	delete (SolidBrush *)arg0;
@@ -2089,61 +2353,61 @@ JNIEXPORT void JNICALL Gdip_NATIVE(SolidBrush_1delete)
 #endif
 
 #ifndef NO_SolidBrush_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(SolidBrush_1new)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(SolidBrush_1new)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(SolidBrush_1new)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(SolidBrush_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, SolidBrush_1new_FUNC);
-	rc = (jint)new SolidBrush(*(Color *)arg0);
+	rc = (jintLong)new SolidBrush(*(Color *)arg0);
 	Gdip_NATIVE_EXIT(env, that, SolidBrush_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_StringFormat_1Clone
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1Clone)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1Clone)
-	(JNIEnv *env, jclass that, jint arg0)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1Clone)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1Clone)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1Clone_FUNC);
-	rc = (jint)((StringFormat *)arg0)->Clone();
+	rc = (jintLong)((StringFormat *)arg0)->Clone();
 	Gdip_NATIVE_EXIT(env, that, StringFormat_1Clone_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_StringFormat_1GenericDefault
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GenericDefault)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GenericDefault)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1GenericDefault)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1GenericDefault)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1GenericDefault_FUNC);
-	rc = (jint)StringFormat::GenericDefault();
+	rc = (jintLong)StringFormat::GenericDefault();
 	Gdip_NATIVE_EXIT(env, that, StringFormat_1GenericDefault_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_StringFormat_1GenericTypographic
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GenericTypographic)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GenericTypographic)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1GenericTypographic)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(StringFormat_1GenericTypographic)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1GenericTypographic_FUNC);
-	rc = (jint)StringFormat::GenericTypographic();
+	rc = (jintLong)StringFormat::GenericTypographic();
 	Gdip_NATIVE_EXIT(env, that, StringFormat_1GenericTypographic_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_StringFormat_1GetFormatFlags
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GetFormatFlags)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GetFormatFlags)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GetFormatFlags)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1GetFormatFlags_FUNC);
@@ -2154,9 +2418,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1GetFormatFlags)
 #endif
 
 #ifndef NO_StringFormat_1SetFormatFlags
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetFormatFlags)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetFormatFlags)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetFormatFlags)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1SetFormatFlags_FUNC);
@@ -2167,9 +2431,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetFormatFlags)
 #endif
 
 #ifndef NO_StringFormat_1SetHotkeyPrefix
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetHotkeyPrefix)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetHotkeyPrefix)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetHotkeyPrefix)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1SetHotkeyPrefix_FUNC);
@@ -2180,9 +2444,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetHotkeyPrefix)
 #endif
 
 #ifndef NO_StringFormat_1SetTabStops
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetTabStops)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jint arg2, jfloatArray arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetTabStops)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2, jfloatArray arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(StringFormat_1SetTabStops)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jint arg2, jfloatArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jint arg2, jfloatArray arg3)
 {
 	jfloat *lparg3=NULL;
 	jint rc = 0;
@@ -2197,9 +2461,9 @@ fail:
 #endif
 
 #ifndef NO_StringFormat_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, StringFormat_1delete_FUNC);
 	delete (StringFormat *)arg0;
@@ -2208,9 +2472,9 @@ JNIEXPORT void JNICALL Gdip_NATIVE(StringFormat_1delete)
 #endif
 
 #ifndef NO_TextureBrush_1ResetTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1ResetTransform_FUNC);
@@ -2221,9 +2485,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ResetTransform)
 #endif
 
 #ifndef NO_TextureBrush_1ScaleTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1ScaleTransform_FUNC);
@@ -2234,9 +2498,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1ScaleTransform)
 #endif
 
 #ifndef NO_TextureBrush_1SetTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
 JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1SetTransform_FUNC);
@@ -2247,9 +2511,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1SetTransform)
 #endif
 
 #ifndef NO_TextureBrush_1TranslateTransform
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform)(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform)(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3);
 JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2, jint arg3)
 {
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1TranslateTransform_FUNC);
@@ -2260,9 +2524,9 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1TranslateTransform)
 #endif
 
 #ifndef NO_TextureBrush_1delete
-extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete)(JNIEnv *env, jclass that, jint arg0);
+extern "C" JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete)(JNIEnv *env, jclass that, jintLong arg0);
 JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1delete_FUNC);
 	delete (TextureBrush *)arg0;
@@ -2271,13 +2535,13 @@ JNIEXPORT void JNICALL Gdip_NATIVE(TextureBrush_1delete)
 #endif
 
 #ifndef NO_TextureBrush_1new
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1new)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5);
-JNIEXPORT jint JNICALL Gdip_NATIVE(TextureBrush_1new)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5)
+extern "C" JNIEXPORT jintLong JNICALL Gdip_NATIVE(TextureBrush_1new)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5);
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(TextureBrush_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jfloat arg2, jfloat arg3, jfloat arg4, jfloat arg5)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, TextureBrush_1new_FUNC);
-	rc = (jint)new TextureBrush((Image *)arg0, (WrapMode)arg1, arg2, arg3, arg4, arg5);
+	rc = (jintLong)new TextureBrush((Image *)arg0, (WrapMode)arg1, arg2, arg3, arg4, arg5);
 	Gdip_NATIVE_EXIT(env, that, TextureBrush_1new_FUNC);
 	return rc;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp
index cfc2a19d06..8d74873551 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_custom.cpp
@@ -19,7 +19,7 @@ extern "C" {
 
 #ifndef NO_Graphics_1DrawLines
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawLines)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTR arg1, jintArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3)
 {
 	Point *points=NULL;
 	jint *lparg2=NULL;
@@ -45,7 +45,7 @@ fail:
 
 #ifndef NO_Graphics_1DrawPolygon
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawPolygon)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTR arg1, jintArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3)
 {
 	Point *points=NULL;
 	jint *lparg2=NULL;
@@ -71,7 +71,7 @@ fail:
 
 #ifndef NO_Graphics_1FillPolygon
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1FillPolygon)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTR arg1, jintArray arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3, jint arg4)
 {
 	Point *points=NULL;
 	jint *lparg2=NULL;
@@ -97,7 +97,7 @@ fail:
 
 #ifndef NO_GraphicsPath_1GetPathPoints
 JNIEXPORT jint JNICALL Gdip_NATIVE(GraphicsPath_1GetPathPoints)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, jfloatArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2)
 {
 	PointF *points=NULL;
 	jfloat *lparg1=NULL;
@@ -123,13 +123,13 @@ fail:
 #endif
 
 
-#if (!defined(NO_Matrix_1TransformPoints__I_3FI) && !defined(SWT_PTR_SIZE_64)) || (!defined(NO_Matrix_1TransformPoints__J_3FI) && defined(SWT_PTR_SIZE_64))
-#ifdef SWT_PTR_SIZE_64
+#if (!defined(NO_Matrix_1TransformPoints__I_3FI) && !defined(JNI64)) || (!defined(NO_Matrix_1TransformPoints__J_3FI) && defined(JNI64))
+#ifdef JNI64
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__J_3FI)
 #else
 JNIEXPORT jint JNICALL Gdip_NATIVE(Matrix_1TransformPoints__I_3FI)
 #endif
-	(JNIEnv *env, jclass that, SWT_PTR arg0, jfloatArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2)
 {
 	PointF *points=NULL;
 	jfloat *lparg1=NULL;
@@ -161,14 +161,14 @@ fail:
 
 #ifndef NO_LinearGradientBrush_1SetInterpolationColors
 JNIEXPORT jint JNICALL Gdip_NATIVE(LinearGradientBrush_1SetInterpolationColors)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTRArray arg1, jfloatArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jfloatArray arg2, jint arg3)
 {
 	Color *colors=NULL;
-	SWT_PTR *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jfloat *lparg2=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, LinearGradientBrush_1SetInterpolationColors_FUNC);
-	if (arg1) if ((lparg1 = env->GetSWT_PTRArrayElements(arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = env->GetIntLongArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = env->GetFloatArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (lparg1) {
 		colors = new Color[arg3];
@@ -182,7 +182,7 @@ fail:
 		delete colors;
 	}
 	if (arg2 && lparg2) env->ReleaseFloatArrayElements(arg2, lparg2, 0);
-	if (arg1 && lparg1) env->ReleaseSWT_PTRArrayElements(arg1, lparg1, 0);
+	if (arg1 && lparg1) env->ReleaseIntLongArrayElements(arg1, lparg1, 0);
 	Gdip_NATIVE_EXIT(env, that, LinearGradientBrush_1SetInterpolationColors_FUNC);
 	return rc;
 }
@@ -190,14 +190,14 @@ fail:
 
 #ifndef NO_PathGradientBrush_1SetInterpolationColors
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetInterpolationColors)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTRArray arg1, jfloatArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jfloatArray arg2, jint arg3)
 {
 	Color *colors=NULL;
-	SWT_PTR *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jfloat *lparg2=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetInterpolationColors_FUNC);
-	if (arg1) if ((lparg1 = env->GetSWT_PTRArrayElements(arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = env->GetIntLongArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = env->GetFloatArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (lparg1) {
 		colors = new Color[arg3];
@@ -211,7 +211,7 @@ fail:
 		delete colors;
 	}
 	if (arg2 && lparg2) env->ReleaseFloatArrayElements(arg2, lparg2, 0);
-	if (arg1 && lparg1) env->ReleaseSWT_PTRArrayElements(arg1, lparg1, 0);
+	if (arg1 && lparg1) env->ReleaseIntLongArrayElements(arg1, lparg1, 0);
 	Gdip_NATIVE_EXIT(env, that, PathGradientBrush_1SetInterpolationColors_FUNC);
 	return rc;
 }
@@ -219,14 +219,14 @@ fail:
 
 #ifndef NO_PathGradientBrush_1SetSurroundColors
 JNIEXPORT jint JNICALL Gdip_NATIVE(PathGradientBrush_1SetSurroundColors)
-	(JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTRArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2)
 {
 	Color *colors=NULL;
-	SWT_PTR *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint *lparg2=NULL;
 	jint rc = 0;
 	Gdip_NATIVE_ENTER(env, that, PathGradientBrush_1SetSurroundColors_FUNC);
-	if (arg1) if ((lparg1 = env->GetSWT_PTRArrayElements(arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = env->GetIntLongArrayElements(arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
 	if (lparg1 && lparg2) {
 		colors = new Color[lparg2[0]];
@@ -240,20 +240,20 @@ fail:
 		delete colors;
 	}	
 	if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-	if (arg1 && lparg1) env->ReleaseSWT_PTRArrayElements(arg1, lparg1, 0);
+	if (arg1 && lparg1) env->ReleaseIntLongArrayElements(arg1, lparg1, 0);
 	Gdip_NATIVE_EXIT(env, that, PathGradientBrush_1SetSurroundColors_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GraphicsPath_1new___3I_3BII
-JNIEXPORT SWT_PTR JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII)
+JNIEXPORT jintLong JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII)
 	(JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jint arg2, jint arg3)
 {
 	Point *points=NULL;
 	jint *lparg0=NULL;
 	jbyte *lparg1=NULL;
-	SWT_PTR rc = 0;
+	jintLong rc = 0;
 	Gdip_NATIVE_ENTER(env, that, GraphicsPath_1new___3I_3BII_FUNC);
 	if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
 	if (lparg0) {
@@ -265,7 +265,7 @@ JNIEXPORT SWT_PTR JNICALL Gdip_NATIVE(GraphicsPath_1new___3I_3BII)
 		}
 	}
 	if (arg1) if ((lparg1 = env->GetByteArrayElements(arg1, NULL)) == NULL) goto fail;
-	rc = (SWT_PTR)new GraphicsPath(points, (BYTE *)lparg1, arg2, (FillMode)arg3);
+	rc = (jintLong)new GraphicsPath(points, (BYTE *)lparg1, arg2, (FillMode)arg3);
 fail:
 	if (arg1 && lparg1) env->ReleaseByteArrayElements(arg1, lparg1, 0);
 	if (lparg0 && points) delete points;
@@ -275,15 +275,24 @@ fail:
 }
 #endif
 
-#ifndef NO_Graphics_1DrawDriverString__IIIII_3FII
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIII_3FII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jfloatArray arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIII_3FII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jfloatArray arg5, jint arg6, jint arg7)
+#if (!defined(NO_Graphics_1DrawDriverString__IIIII_3FII) && !defined(JNI64)) || (!defined(Graphics_1DrawDriverString__JJIJJ_3FIJ) && defined(JNI64))
+#ifdef JNI64
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJ_3FIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jfloatArray arg5, jint arg6, jintLong arg7);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__JJIJJ_3FIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jfloatArray arg5, jint arg6, jintLong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIII_3FII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jfloatArray arg5, jint arg6, jintLong arg7);
+JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIII_3FII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jfloatArray arg5, jint arg6, jintLong arg7)
+#endif
+	
 {
 	PointF *points=NULL;
 	jfloat *lparg5=NULL;
 	jint rc = 0;
+#ifdef JNI64
+	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString__JJIJJ_3FIJ_FUNC);
+#else
 	Gdip_NATIVE_ENTER(env, that, Graphics_1DrawDriverString__IIIII_3FII_FUNC);
+#endif
 	if (arg5) if ((lparg5 = env->GetFloatArrayElements(arg5, NULL)) == NULL) goto fail;
 	if (lparg5) {
 		points = new PointF[arg2];
@@ -297,15 +306,19 @@ JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1DrawDriverString__IIIII_3FII)
 fail:
 	if (arg5 && lparg5) env->ReleaseFloatArrayElements(arg5, lparg5, 0);
 	if (lparg5 && points) delete points;
+#ifdef JNI64
+	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString__JJIJJ_3FIJ_FUNC);
+#else
 	Gdip_NATIVE_EXIT(env, that, Graphics_1DrawDriverString__IIIII_3FII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_Graphics_1MeasureDriverString
-extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureDriverString)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jfloatArray arg4, jint arg5, jint arg6, jobject arg7);
+extern "C" JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureDriverString)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jfloatArray arg4, jint arg5, jintLong arg6, jobject arg7);
 JNIEXPORT jint JNICALL Gdip_NATIVE(Graphics_1MeasureDriverString)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jfloatArray arg4, jint arg5, jint arg6, jobject arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jfloatArray arg4, jint arg5, jintLong arg6, jobject arg7)
 {
 	PointF *points=NULL;
 	jfloat *lparg4=NULL;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp
index 07076a6cd2..a976fbe84d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.cpp
@@ -24,9 +24,21 @@ char * Gdip_nativeFunctionNames[] = {
 	"Bitmap_1LockBits",
 	"Bitmap_1UnlockBits",
 	"Bitmap_1delete",
+#ifndef JNI64
 	"Bitmap_1new__I",
+#else
+	"Bitmap_1new__J",
+#endif
+#ifndef JNI64
 	"Bitmap_1new__II",
+#else
+	"Bitmap_1new__JJ",
+#endif
+#ifndef JNI64
 	"Bitmap_1new__IIIII",
+#else
+	"Bitmap_1new__IIIIJ",
+#endif
 	"Bitmap_1new___3CZ",
 	"Brush_1Clone",
 	"Brush_1GetType",
@@ -41,8 +53,16 @@ char * Gdip_nativeFunctionNames[] = {
 	"Font_1GetStyle",
 	"Font_1IsAvailable",
 	"Font_1delete",
+#ifndef JNI64
 	"Font_1new__II",
+#else
+	"Font_1new__JJ",
+#endif
+#ifndef JNI64
 	"Font_1new___3CFIII",
+#else
+	"Font_1new___3CFIIJ",
+#endif
 	"GdiplusShutdown",
 	"GdiplusStartup",
 	"GdiplusStartupInput_1sizeof",
@@ -69,18 +89,42 @@ char * Gdip_nativeFunctionNames[] = {
 	"GraphicsPath_1new__I",
 	"GraphicsPath_1new___3I_3BII",
 	"Graphics_1DrawArc",
+#ifndef JNI64
 	"Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II",
+#else
+	"Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ",
+#endif
+#ifndef JNI64
 	"Graphics_1DrawDriverString__IIIII_3FII",
+#else
+	"Graphics_1DrawDriverString__JJIJJ_3FIJ",
+#endif
 	"Graphics_1DrawEllipse",
+#ifndef JNI64
 	"Graphics_1DrawImage__IIII",
+#else
+	"Graphics_1DrawImage__JJII",
+#endif
+#ifndef JNI64
 	"Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII",
+#else
+	"Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ",
+#endif
 	"Graphics_1DrawLine",
 	"Graphics_1DrawLines",
 	"Graphics_1DrawPath",
 	"Graphics_1DrawPolygon",
 	"Graphics_1DrawRectangle",
+#ifndef JNI64
 	"Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I",
+#else
+	"Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J",
+#endif
+#ifndef JNI64
 	"Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II",
+#else
+	"Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ",
+#endif
 	"Graphics_1FillEllipse",
 	"Graphics_1FillPath",
 	"Graphics_1FillPie",
@@ -88,8 +132,16 @@ char * Gdip_nativeFunctionNames[] = {
 	"Graphics_1FillRectangle",
 	"Graphics_1Flush",
 	"Graphics_1GetClip",
+#ifndef JNI64
 	"Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2",
+#else
+	"Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2",
+#endif
+#ifndef JNI64
 	"Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2",
+#else
+	"Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2",
+#endif
 	"Graphics_1GetHDC",
 	"Graphics_1GetInterpolationMode",
 	"Graphics_1GetSmoothingMode",
@@ -97,17 +149,41 @@ char * Gdip_nativeFunctionNames[] = {
 	"Graphics_1GetTransform",
 	"Graphics_1GetVisibleClipBounds",
 	"Graphics_1MeasureDriverString",
+#ifndef JNI64
 	"Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2",
+#else
+	"Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2",
+#endif
+#ifndef JNI64
 	"Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2",
+#else
+	"Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2",
+#endif
 	"Graphics_1ReleaseHDC",
 	"Graphics_1ResetClip",
 	"Graphics_1Restore",
 	"Graphics_1Save",
 	"Graphics_1ScaleTransform",
+#ifndef JNI64
 	"Graphics_1SetClip__III",
+#else
+	"Graphics_1SetClip__JJI",
+#endif
+#ifndef JNI64
 	"Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I",
+#else
+	"Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I",
+#endif
+#ifndef JNI64
 	"Graphics_1SetClipPath__II",
+#else
+	"Graphics_1SetClipPath__JJ",
+#endif
+#ifndef JNI64
 	"Graphics_1SetClipPath__III",
+#else
+	"Graphics_1SetClipPath__JJI",
+#endif
 	"Graphics_1SetCompositingQuality",
 	"Graphics_1SetInterpolationMode",
 	"Graphics_1SetPageUnit",
@@ -145,13 +221,29 @@ char * Gdip_nativeFunctionNames[] = {
 	"Matrix_1Scale",
 	"Matrix_1SetElements",
 	"Matrix_1Shear",
+#ifndef JNI64
 	"Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I",
+#else
+	"Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I",
+#endif
+#ifndef JNI64
 	"Matrix_1TransformPoints__I_3FI",
+#else
+	"Matrix_1TransformPoints__J_3FI",
+#endif
 	"Matrix_1Translate",
 	"Matrix_1delete",
 	"Matrix_1new",
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI",
+#endif
 	"PathGradientBrush_1SetCenterColor",
 	"PathGradientBrush_1SetCenterPoint",
 	"PathGradientBrush_1SetGraphicsPath",
@@ -177,7 +269,11 @@ char * Gdip_nativeFunctionNames[] = {
 	"Region_1IsInfinite",
 	"Region_1delete",
 	"Region_1new__",
+#ifndef JNI64
 	"Region_1new__I",
+#else
+	"Region_1new__J",
+#endif
 	"Region_1newGraphicsPath",
 	"SolidBrush_1delete",
 	"SolidBrush_1new",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h
index 959bf09010..1f6f09f086 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_stats.h
@@ -32,9 +32,21 @@ typedef enum {
 	Bitmap_1LockBits_FUNC,
 	Bitmap_1UnlockBits_FUNC,
 	Bitmap_1delete_FUNC,
+#ifndef JNI64
 	Bitmap_1new__I_FUNC,
+#else
+	Bitmap_1new__J_FUNC,
+#endif
+#ifndef JNI64
 	Bitmap_1new__II_FUNC,
+#else
+	Bitmap_1new__JJ_FUNC,
+#endif
+#ifndef JNI64
 	Bitmap_1new__IIIII_FUNC,
+#else
+	Bitmap_1new__IIIIJ_FUNC,
+#endif
 	Bitmap_1new___3CZ_FUNC,
 	Brush_1Clone_FUNC,
 	Brush_1GetType_FUNC,
@@ -49,8 +61,16 @@ typedef enum {
 	Font_1GetStyle_FUNC,
 	Font_1IsAvailable_FUNC,
 	Font_1delete_FUNC,
+#ifndef JNI64
 	Font_1new__II_FUNC,
+#else
+	Font_1new__JJ_FUNC,
+#endif
+#ifndef JNI64
 	Font_1new___3CFIII_FUNC,
+#else
+	Font_1new___3CFIIJ_FUNC,
+#endif
 	GdiplusShutdown_FUNC,
 	GdiplusStartup_FUNC,
 	GdiplusStartupInput_1sizeof_FUNC,
@@ -77,18 +97,42 @@ typedef enum {
 	GraphicsPath_1new__I_FUNC,
 	GraphicsPath_1new___3I_3BII_FUNC,
 	Graphics_1DrawArc_FUNC,
+#ifndef JNI64
 	Graphics_1DrawDriverString__IIIIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC,
+#else
+	Graphics_1DrawDriverString__JJIJJLorg_eclipse_swt_internal_gdip_PointF_2IJ_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1DrawDriverString__IIIII_3FII_FUNC,
+#else
+	Graphics_1DrawDriverString__JJIJJ_3FIJ_FUNC,
+#endif
 	Graphics_1DrawEllipse_FUNC,
+#ifndef JNI64
 	Graphics_1DrawImage__IIII_FUNC,
+#else
+	Graphics_1DrawImage__JJII_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1DrawImage__IILorg_eclipse_swt_internal_gdip_Rect_2IIIIIIII_FUNC,
+#else
+	Graphics_1DrawImage__JJLorg_eclipse_swt_internal_gdip_Rect_2IIIIIJJJ_FUNC,
+#endif
 	Graphics_1DrawLine_FUNC,
 	Graphics_1DrawLines_FUNC,
 	Graphics_1DrawPath_FUNC,
 	Graphics_1DrawPolygon_FUNC,
 	Graphics_1DrawRectangle_FUNC,
+#ifndef JNI64
 	Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC,
+#else
+	Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2J_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1DrawString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2II_FUNC,
+#else
+	Graphics_1DrawString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JJ_FUNC,
+#endif
 	Graphics_1FillEllipse_FUNC,
 	Graphics_1FillPath_FUNC,
 	Graphics_1FillPie_FUNC,
@@ -96,8 +140,16 @@ typedef enum {
 	Graphics_1FillRectangle_FUNC,
 	Graphics_1Flush_FUNC,
 	Graphics_1GetClip_FUNC,
+#ifndef JNI64
 	Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC,
+#else
+	Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1GetClipBounds__ILorg_eclipse_swt_internal_gdip_Rect_2_FUNC,
+#else
+	Graphics_1GetClipBounds__JLorg_eclipse_swt_internal_gdip_Rect_2_FUNC,
+#endif
 	Graphics_1GetHDC_FUNC,
 	Graphics_1GetInterpolationMode_FUNC,
 	Graphics_1GetSmoothingMode_FUNC,
@@ -105,17 +157,41 @@ typedef enum {
 	Graphics_1GetTransform_FUNC,
 	Graphics_1GetVisibleClipBounds_FUNC,
 	Graphics_1MeasureDriverString_FUNC,
+#ifndef JNI64
 	Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2ILorg_eclipse_swt_internal_gdip_RectF_2_FUNC,
+#else
+	Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2JLorg_eclipse_swt_internal_gdip_RectF_2_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1MeasureString__I_3CIILorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC,
+#else
+	Graphics_1MeasureString__J_3CIJLorg_eclipse_swt_internal_gdip_PointF_2Lorg_eclipse_swt_internal_gdip_RectF_2_FUNC,
+#endif
 	Graphics_1ReleaseHDC_FUNC,
 	Graphics_1ResetClip_FUNC,
 	Graphics_1Restore_FUNC,
 	Graphics_1Save_FUNC,
 	Graphics_1ScaleTransform_FUNC,
+#ifndef JNI64
 	Graphics_1SetClip__III_FUNC,
+#else
+	Graphics_1SetClip__JJI_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1SetClip__ILorg_eclipse_swt_internal_gdip_Rect_2I_FUNC,
+#else
+	Graphics_1SetClip__JLorg_eclipse_swt_internal_gdip_Rect_2I_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1SetClipPath__II_FUNC,
+#else
+	Graphics_1SetClipPath__JJ_FUNC,
+#endif
+#ifndef JNI64
 	Graphics_1SetClipPath__III_FUNC,
+#else
+	Graphics_1SetClipPath__JJI_FUNC,
+#endif
 	Graphics_1SetCompositingQuality_FUNC,
 	Graphics_1SetInterpolationMode_FUNC,
 	Graphics_1SetPageUnit_FUNC,
@@ -153,13 +229,29 @@ typedef enum {
 	Matrix_1Scale_FUNC,
 	Matrix_1SetElements_FUNC,
 	Matrix_1Shear_FUNC,
+#ifndef JNI64
 	Matrix_1TransformPoints__ILorg_eclipse_swt_internal_gdip_PointF_2I_FUNC,
+#else
+	Matrix_1TransformPoints__JLorg_eclipse_swt_internal_gdip_PointF_2I_FUNC,
+#endif
+#ifndef JNI64
 	Matrix_1TransformPoints__I_3FI_FUNC,
+#else
+	Matrix_1TransformPoints__J_3FI_FUNC,
+#endif
 	Matrix_1Translate_FUNC,
 	Matrix_1delete_FUNC,
 	Matrix_1new_FUNC,
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2I_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_gdip_BitmapData_2J_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_gdip_ColorPalette_2JI_FUNC,
+#endif
 	PathGradientBrush_1SetCenterColor_FUNC,
 	PathGradientBrush_1SetCenterPoint_FUNC,
 	PathGradientBrush_1SetGraphicsPath_FUNC,
@@ -185,7 +277,11 @@ typedef enum {
 	Region_1IsInfinite_FUNC,
 	Region_1delete_FUNC,
 	Region_1new___FUNC,
+#ifndef JNI64
 	Region_1new__I_FUNC,
+#else
+	Region_1new__J_FUNC,
+#endif
 	Region_1newGraphicsPath_FUNC,
 	SolidBrush_1delete_FUNC,
 	SolidBrush_1new_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp
index bf74f01eed..5ccd52ac14 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/gdip_structs.cpp
@@ -29,8 +29,8 @@ void cacheBitmapDataFields(JNIEnv *env, jobject lpObject)
 	BitmapDataFc.Height = env->GetFieldID(BitmapDataFc.clazz, "Height", "I");
 	BitmapDataFc.Stride = env->GetFieldID(BitmapDataFc.clazz, "Stride", "I");
 	BitmapDataFc.PixelFormat = env->GetFieldID(BitmapDataFc.clazz, "PixelFormat", "I");
-	BitmapDataFc.Scan0 = env->GetFieldID(BitmapDataFc.clazz, "Scan0", "I");
-	BitmapDataFc.Reserved = env->GetFieldID(BitmapDataFc.clazz, "Reserved", "I");
+	BitmapDataFc.Scan0 = env->GetFieldID(BitmapDataFc.clazz, "Scan0", I_J);
+	BitmapDataFc.Reserved = env->GetFieldID(BitmapDataFc.clazz, "Reserved", I_J);
 	BitmapDataFc.cached = 1;
 }
 
@@ -41,8 +41,8 @@ BitmapData *getBitmapDataFields(JNIEnv *env, jobject lpObject, BitmapData *lpStr
 	lpStruct->Height = env->GetIntField(lpObject, BitmapDataFc.Height);
 	lpStruct->Stride = env->GetIntField(lpObject, BitmapDataFc.Stride);
 	lpStruct->PixelFormat = (PixelFormat)env->GetIntField(lpObject, BitmapDataFc.PixelFormat);
-	lpStruct->Scan0 = (void*)env->GetIntField(lpObject, BitmapDataFc.Scan0);
-	lpStruct->Reserved = (UINT_PTR)env->GetIntField(lpObject, BitmapDataFc.Reserved);
+	lpStruct->Scan0 = (void*)env->GetIntLongField(lpObject, BitmapDataFc.Scan0);
+	lpStruct->Reserved = (UINT_PTR)env->GetIntLongField(lpObject, BitmapDataFc.Reserved);
 	return lpStruct;
 }
 
@@ -53,8 +53,8 @@ void setBitmapDataFields(JNIEnv *env, jobject lpObject, BitmapData *lpStruct)
 	env->SetIntField(lpObject, BitmapDataFc.Height, (jint)lpStruct->Height);
 	env->SetIntField(lpObject, BitmapDataFc.Stride, (jint)lpStruct->Stride);
 	env->SetIntField(lpObject, BitmapDataFc.PixelFormat, (jint)lpStruct->PixelFormat);
-	env->SetIntField(lpObject, BitmapDataFc.Scan0, (jint)lpStruct->Scan0);
-	env->SetIntField(lpObject, BitmapDataFc.Reserved, (jint)lpStruct->Reserved);
+	env->SetIntLongField(lpObject, BitmapDataFc.Scan0, (jintLong)lpStruct->Scan0);
+	env->SetIntLongField(lpObject, BitmapDataFc.Reserved, (jintLong)lpStruct->Reserved);
 }
 #endif
 
@@ -84,7 +84,7 @@ ColorPalette *getColorPaletteFields(JNIEnv *env, jobject lpObject, ColorPalette
 	lpStruct->Count = env->GetIntField(lpObject, ColorPaletteFc.Count);
 	{
 	jintArray lpObject1 = (jintArray)env->GetObjectField(lpObject, ColorPaletteFc.Entries);
-	env->GetIntArrayRegion(lpObject1, 0, sizeof(lpStruct->Entries) / 4, (jint *)lpStruct->Entries);
+	env->GetIntArrayRegion(lpObject1, 0, sizeof(lpStruct->Entries) / sizeof(jint), (jint *)lpStruct->Entries);
 	}
 	return lpStruct;
 }
@@ -96,7 +96,7 @@ void setColorPaletteFields(JNIEnv *env, jobject lpObject, ColorPalette *lpStruct
 	env->SetIntField(lpObject, ColorPaletteFc.Count, (jint)lpStruct->Count);
 	{
 	jintArray lpObject1 = (jintArray)env->GetObjectField(lpObject, ColorPaletteFc.Entries);
-	env->SetIntArrayRegion(lpObject1, 0, sizeof(lpStruct->Entries) / 4, (jint *)lpStruct->Entries);
+	env->SetIntArrayRegion(lpObject1, 0, sizeof(lpStruct->Entries) / sizeof(jint), (jint *)lpStruct->Entries);
 	}
 }
 #endif
@@ -115,7 +115,7 @@ void cacheGdiplusStartupInputFields(JNIEnv *env, jobject lpObject)
 	if (GdiplusStartupInputFc.cached) return;
 	GdiplusStartupInputFc.clazz = env->GetObjectClass(lpObject);
 	GdiplusStartupInputFc.GdiplusVersion = env->GetFieldID(GdiplusStartupInputFc.clazz, "GdiplusVersion", "I");
-	GdiplusStartupInputFc.DebugEventCallback = env->GetFieldID(GdiplusStartupInputFc.clazz, "DebugEventCallback", "I");
+	GdiplusStartupInputFc.DebugEventCallback = env->GetFieldID(GdiplusStartupInputFc.clazz, "DebugEventCallback", I_J);
 	GdiplusStartupInputFc.SuppressBackgroundThread = env->GetFieldID(GdiplusStartupInputFc.clazz, "SuppressBackgroundThread", "Z");
 	GdiplusStartupInputFc.SuppressExternalCodecs = env->GetFieldID(GdiplusStartupInputFc.clazz, "SuppressExternalCodecs", "Z");
 	GdiplusStartupInputFc.cached = 1;
@@ -125,7 +125,7 @@ GdiplusStartupInput *getGdiplusStartupInputFields(JNIEnv *env, jobject lpObject,
 {
 	if (!GdiplusStartupInputFc.cached) cacheGdiplusStartupInputFields(env, lpObject);
 	lpStruct->GdiplusVersion = env->GetIntField(lpObject, GdiplusStartupInputFc.GdiplusVersion);
-	lpStruct->DebugEventCallback = (DebugEventProc)env->GetIntField(lpObject, GdiplusStartupInputFc.DebugEventCallback);
+	lpStruct->DebugEventCallback = (DebugEventProc)env->GetIntLongField(lpObject, GdiplusStartupInputFc.DebugEventCallback);
 	lpStruct->SuppressBackgroundThread = (BOOL)env->GetBooleanField(lpObject, GdiplusStartupInputFc.SuppressBackgroundThread);
 	lpStruct->SuppressExternalCodecs = (BOOL)env->GetBooleanField(lpObject, GdiplusStartupInputFc.SuppressExternalCodecs);
 	return lpStruct;
@@ -135,7 +135,7 @@ void setGdiplusStartupInputFields(JNIEnv *env, jobject lpObject, GdiplusStartupI
 {
 	if (!GdiplusStartupInputFc.cached) cacheGdiplusStartupInputFields(env, lpObject);
 	env->SetIntField(lpObject, GdiplusStartupInputFc.GdiplusVersion, (jint)lpStruct->GdiplusVersion);
-	env->SetIntField(lpObject, GdiplusStartupInputFc.DebugEventCallback, (jint)lpStruct->DebugEventCallback);
+	env->SetIntLongField(lpObject, GdiplusStartupInputFc.DebugEventCallback, (jintLong)lpStruct->DebugEventCallback);
 	env->SetBooleanField(lpObject, GdiplusStartupInputFc.SuppressBackgroundThread, (jboolean)lpStruct->SuppressBackgroundThread);
 	env->SetBooleanField(lpObject, GdiplusStartupInputFc.SuppressExternalCodecs, (jboolean)lpStruct->SuppressExternalCodecs);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c
index 83f432f218..43d85b6972 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c
@@ -41,7 +41,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ACTCTX_1sizeof)
 
 #ifndef NO_AbortDoc
 JNIEXPORT jint JNICALL OS_NATIVE(AbortDoc)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, AbortDoc_FUNC);
@@ -53,43 +53,35 @@ JNIEXPORT jint JNICALL OS_NATIVE(AbortDoc)
 
 #ifndef NO_ActivateActCtx
 JNIEXPORT jboolean JNICALL OS_NATIVE(ActivateActCtx)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ActivateActCtx_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
 	rc = (jboolean)ActivateActCtx(arg0, (ULONG_PTR*)lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(ActivateActCtx_LIB);
-			if (hm) fp = GetProcAddress(hm, "ActivateActCtx");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, ActivateActCtx)
 		if (fp) {
-			rc = (jboolean)fp(arg0, (ULONG_PTR*)lparg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, ULONG_PTR*))fp)(arg0, (ULONG_PTR*)lparg1);
 		}
 	}
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, ActivateActCtx_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_ActivateKeyboardLayout
-JNIEXPORT jint JNICALL OS_NATIVE(ActivateKeyboardLayout)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ActivateKeyboardLayout)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ActivateKeyboardLayout_FUNC);
-	rc = (jint)ActivateKeyboardLayout((HKL)arg0, arg1);
+	rc = (jintLong)ActivateKeyboardLayout((HKL)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, ActivateKeyboardLayout_FUNC);
 	return rc;
 }
@@ -97,7 +89,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ActivateKeyboardLayout)
 
 #ifndef NO_AddFontResourceExA
 JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintLong arg2)
 {
 	jbyte *lparg0=NULL;
 	jint rc = 0;
@@ -107,17 +99,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExA)
 	rc = (jint)AddFontResourceExA(lparg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AddFontResourceExA_LIB);
-			if (hm) fp = GetProcAddress(hm, "AddFontResourceExA");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AddFontResourceExA)
 		if (fp) {
-			rc = (jint)fp(lparg0, arg1, arg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jbyte *, jint, jintLong))fp)(lparg0, arg1, arg2);
 		}
 	}
 fail:
@@ -129,7 +113,7 @@ fail:
 
 #ifndef NO_AddFontResourceExW
 JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExW)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintLong arg2)
 {
 	jchar *lparg0=NULL;
 	jint rc = 0;
@@ -139,17 +123,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(AddFontResourceExW)
 	rc = (jint)AddFontResourceExW(lparg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AddFontResourceExW_LIB);
-			if (hm) fp = GetProcAddress(hm, "AddFontResourceExW");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AddFontResourceExW)
 		if (fp) {
-			rc = (jint)fp(lparg0, arg1, arg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jchar *, jint, jintLong))fp)(lparg0, arg1, arg2);
 		}
 	}
 fail:
@@ -185,17 +161,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AllowSetForegroundWindow)
 	rc = (jboolean)AllowSetForegroundWindow(arg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AllowSetForegroundWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "AllowSetForegroundWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AllowSetForegroundWindow)
 		if (fp) {
-			rc = (jboolean)fp(arg0);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jint))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, AllowSetForegroundWindow_FUNC);
@@ -205,7 +173,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AllowSetForegroundWindow)
 
 #ifndef NO_AlphaBlend
 JNIEXPORT jboolean JNICALL OS_NATIVE(AlphaBlend)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jobject arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jobject arg10)
 {
 	BLENDFUNCTION _arg10, *lparg10=NULL;
 	jboolean rc = 0;
@@ -215,17 +183,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AlphaBlend)
 	rc = (jboolean)AlphaBlend(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, *lparg10);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AlphaBlend_LIB);
-			if (hm) fp = GetProcAddress(hm, "AlphaBlend");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AlphaBlend)
 		if (fp) {
-			rc = (jboolean)fp(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, *lparg10);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint, jintLong, jint, jint, jint, jint, BLENDFUNCTION))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, *lparg10);
 		}
 	}
 fail:
@@ -237,7 +197,7 @@ fail:
 
 #ifndef NO_AnimateWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(AnimateWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, AnimateWindow_FUNC);
@@ -245,17 +205,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AnimateWindow)
 	rc = (jboolean)AnimateWindow((HWND)arg0, arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AnimateWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "AnimateWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AnimateWindow)
 		if (fp) {
-			rc = (jboolean)fp((HWND)arg0, arg1, arg2);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint, jint))fp)((HWND)arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, AnimateWindow_FUNC);
@@ -265,7 +217,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(AnimateWindow)
 
 #ifndef NO_Arc
 JNIEXPORT jboolean JNICALL OS_NATIVE(Arc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, Arc_FUNC);
@@ -293,17 +245,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(AssocQueryStringA)
 	rc = (jint)AssocQueryStringA(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AssocQueryStringA_LIB);
-			if (hm) fp = GetProcAddress(hm, "AssocQueryStringA");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AssocQueryStringA)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jbyte *, jbyte *, jbyte *, jint *))fp)(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
 		}
 	}
 fail:
@@ -334,17 +278,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(AssocQueryStringW)
 	rc = (jint)AssocQueryStringW(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(AssocQueryStringW_LIB);
-			if (hm) fp = GetProcAddress(hm, "AssocQueryStringW");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, AssocQueryStringW)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, jchar *, jchar *, jchar *, jint *))fp)(arg0, arg1, lparg2, lparg3, lparg4, lparg5);
 		}
 	}
 fail:
@@ -442,36 +378,28 @@ JNIEXPORT jint JNICALL OS_NATIVE(BUTTON_1IMAGELIST_1sizeof)
 #endif
 
 #ifndef NO_BeginBufferedPaint
-JNIEXPORT jint JNICALL OS_NATIVE(BeginBufferedPaint)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jobject arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(BeginBufferedPaint)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jobject arg3, jintLongArray arg4)
 {
 	RECT _arg1, *lparg1=NULL;
 	BP_PAINTPARAMS _arg3, *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, BeginBufferedPaint_FUNC);
 	if (arg1) if ((lparg1 = getRECTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getBP_PAINTPARAMSFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)BeginBufferedPaint((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4);
+	rc = (jintLong)BeginBufferedPaint((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(BeginBufferedPaint_LIB);
-			if (hm) fp = GetProcAddress(hm, "BeginBufferedPaint");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, BeginBufferedPaint)
 		if (fp) {
-			rc = (jint)fp((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HDC, RECT *, jint, BP_PAINTPARAMS *, HDC*))fp)((HDC)arg0, lparg1, arg2, lparg3, (HDC*)lparg4);
 		}
 	}
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) setBP_PAINTPARAMSFields(env, arg3, lparg3);
 	if (arg1 && lparg1) setRECTFields(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, BeginBufferedPaint_FUNC);
@@ -480,26 +408,26 @@ fail:
 #endif
 
 #ifndef NO_BeginDeferWindowPos
-JNIEXPORT jint JNICALL OS_NATIVE(BeginDeferWindowPos)
+JNIEXPORT jintLong JNICALL OS_NATIVE(BeginDeferWindowPos)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, BeginDeferWindowPos_FUNC);
-	rc = (jint)BeginDeferWindowPos(arg0);
+	rc = (jintLong)BeginDeferWindowPos(arg0);
 	OS_NATIVE_EXIT(env, that, BeginDeferWindowPos_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_BeginPaint
-JNIEXPORT jint JNICALL OS_NATIVE(BeginPaint)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(BeginPaint)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	PAINTSTRUCT _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, BeginPaint_FUNC);
 	if (arg1) if ((lparg1 = getPAINTSTRUCTFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)BeginPaint((HWND)arg0, lparg1);
+	rc = (jintLong)BeginPaint((HWND)arg0, lparg1);
 fail:
 	if (arg1 && lparg1) setPAINTSTRUCTFields(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, BeginPaint_FUNC);
@@ -509,7 +437,7 @@ fail:
 
 #ifndef NO_BeginPath
 JNIEXPORT jboolean JNICALL OS_NATIVE(BeginPath)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, BeginPath_FUNC);
@@ -521,7 +449,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(BeginPath)
 
 #ifndef NO_BitBlt
 JNIEXPORT jboolean JNICALL OS_NATIVE(BitBlt)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7, jint arg8)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, BitBlt_FUNC);
@@ -533,7 +461,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(BitBlt)
 
 #ifndef NO_BringWindowToTop
 JNIEXPORT jboolean JNICALL OS_NATIVE(BringWindowToTop)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, BringWindowToTop_FUNC);
@@ -553,17 +481,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintInit)
 	rc = (jint)BufferedPaintInit();
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(BufferedPaintInit_LIB);
-			if (hm) fp = GetProcAddress(hm, "BufferedPaintInit");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, BufferedPaintInit)
 		if (fp) {
-			rc = (jint)fp();
+			rc = (jint)((jint (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, BufferedPaintInit_FUNC);
@@ -573,7 +493,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintInit)
 
 #ifndef NO_BufferedPaintSetAlpha
 JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintSetAlpha)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jbyte arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jbyte arg2)
 {
 	RECT _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -583,17 +503,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintSetAlpha)
 	rc = (jint)BufferedPaintSetAlpha((HPAINTBUFFER)arg0, lparg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(BufferedPaintSetAlpha_LIB);
-			if (hm) fp = GetProcAddress(hm, "BufferedPaintSetAlpha");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, BufferedPaintSetAlpha)
 		if (fp) {
-			rc = (jint)fp((HPAINTBUFFER)arg0, lparg1, arg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HPAINTBUFFER, RECT *, jbyte))fp)((HPAINTBUFFER)arg0, lparg1, arg2);
 		}
 	}
 fail:
@@ -613,17 +525,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(BufferedPaintUnInit)
 	rc = (jint)BufferedPaintUnInit();
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(BufferedPaintUnInit_LIB);
-			if (hm) fp = GetProcAddress(hm, "BufferedPaintUnInit");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, BufferedPaintUnInit)
 		if (fp) {
-			rc = (jint)fp();
+			rc = (jint)((jint (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, BufferedPaintUnInit_FUNC);
@@ -705,7 +609,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CREATESTRUCT_1sizeof)
 
 #ifndef NO_Call
 JNIEXPORT jint JNICALL OS_NATIVE(Call)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	DLLVERSIONINFO _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -720,84 +624,84 @@ fail:
 #endif
 
 #ifndef NO_CallNextHookEx
-JNIEXPORT jint JNICALL OS_NATIVE(CallNextHookEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CallNextHookEx)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CallNextHookEx_FUNC);
-	rc = (jint)CallNextHookEx((HHOOK)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	rc = (jintLong)CallNextHookEx((HHOOK)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
 	OS_NATIVE_EXIT(env, that, CallNextHookEx_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CallWindowProcA
-JNIEXPORT jint JNICALL OS_NATIVE(CallWindowProcA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CallWindowProcA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CallWindowProcA_FUNC);
-	rc = (jint)CallWindowProcA((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4);
+	rc = (jintLong)CallWindowProcA((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4);
 	OS_NATIVE_EXIT(env, that, CallWindowProcA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CallWindowProcW
-JNIEXPORT jint JNICALL OS_NATIVE(CallWindowProcW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CallWindowProcW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CallWindowProcW_FUNC);
-	rc = (jint)CallWindowProcW((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4);
+	rc = (jintLong)CallWindowProcW((WNDPROC)arg0, (HWND)arg1, arg2, arg3, arg4);
 	OS_NATIVE_EXIT(env, that, CallWindowProcW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CharLowerA
-JNIEXPORT jint JNICALL OS_NATIVE(CharLowerA)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CharLowerA)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CharLowerA_FUNC);
-	rc = (jint)CharLowerA((LPSTR)arg0);
+	rc = (jintLong)CharLowerA((LPSTR)arg0);
 	OS_NATIVE_EXIT(env, that, CharLowerA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CharLowerW
-JNIEXPORT jint JNICALL OS_NATIVE(CharLowerW)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CharLowerW)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CharLowerW_FUNC);
-	rc = (jint)CharLowerW((LPWSTR)arg0);
+	rc = (jintLong)CharLowerW((LPWSTR)arg0);
 	OS_NATIVE_EXIT(env, that, CharLowerW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CharUpperA
-JNIEXPORT jint JNICALL OS_NATIVE(CharUpperA)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CharUpperA)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CharUpperA_FUNC);
-	rc = (jint)CharUpperA((LPSTR)arg0);
+	rc = (jintLong)CharUpperA((LPSTR)arg0);
 	OS_NATIVE_EXIT(env, that, CharUpperA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CharUpperW
-JNIEXPORT jint JNICALL OS_NATIVE(CharUpperW)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CharUpperW)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CharUpperW_FUNC);
-	rc = (jint)CharUpperW((LPWSTR)arg0);
+	rc = (jintLong)CharUpperW((LPWSTR)arg0);
 	OS_NATIVE_EXIT(env, that, CharUpperW_FUNC);
 	return rc;
 }
@@ -805,7 +709,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CharUpperW)
 
 #ifndef NO_CheckMenuItem
 JNIEXPORT jboolean JNICALL OS_NATIVE(CheckMenuItem)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CheckMenuItem_FUNC);
@@ -881,7 +785,7 @@ fail:
 
 #ifndef NO_ClientToScreen
 JNIEXPORT jboolean JNICALL OS_NATIVE(ClientToScreen)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	POINT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -908,12 +812,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CloseClipboard)
 #endif
 
 #ifndef NO_CloseEnhMetaFile
-JNIEXPORT jint JNICALL OS_NATIVE(CloseEnhMetaFile)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CloseEnhMetaFile)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CloseEnhMetaFile_FUNC);
-	rc = (jint)CloseEnhMetaFile((HDC)arg0);
+	rc = (jintLong)CloseEnhMetaFile((HDC)arg0);
 	OS_NATIVE_EXIT(env, that, CloseEnhMetaFile_FUNC);
 	return rc;
 }
@@ -921,7 +825,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CloseEnhMetaFile)
 
 #ifndef NO_CloseHandle
 JNIEXPORT jboolean JNICALL OS_NATIVE(CloseHandle)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CloseHandle_FUNC);
@@ -933,7 +837,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CloseHandle)
 
 #ifndef NO_CloseThemeData
 JNIEXPORT jint JNICALL OS_NATIVE(CloseThemeData)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CloseThemeData_FUNC);
@@ -941,17 +845,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(CloseThemeData)
 	rc = (jint)CloseThemeData((HTHEME)arg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(CloseThemeData_LIB);
-			if (hm) fp = GetProcAddress(hm, "CloseThemeData");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, CloseThemeData)
 		if (fp) {
-			rc = (jint)fp((HTHEME)arg0);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HTHEME))fp)((HTHEME)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CloseThemeData_FUNC);
@@ -961,19 +857,19 @@ JNIEXPORT jint JNICALL OS_NATIVE(CloseThemeData)
 
 #ifndef NO_CoCreateInstance
 JNIEXPORT jint JNICALL OS_NATIVE(CoCreateInstance)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2, jbyteArray arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintLongArray arg4)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg3=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CoCreateInstance_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)CoCreateInstance((REFCLSID)lparg0, (LPUNKNOWN)arg1, arg2, (REFIID)lparg3, (LPVOID *)lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, CoCreateInstance_FUNC);
@@ -991,17 +887,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetIsFeatureEnabled)
 	rc = (jint)CoInternetIsFeatureEnabled(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(CoInternetIsFeatureEnabled_LIB);
-			if (hm) fp = GetProcAddress(hm, "CoInternetIsFeatureEnabled");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, CoInternetIsFeatureEnabled)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CoInternetIsFeatureEnabled_FUNC);
@@ -1019,17 +907,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetSetFeatureEnabled)
 	rc = (jint)CoInternetSetFeatureEnabled(arg0, arg1, (BOOL)arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(CoInternetSetFeatureEnabled_LIB);
-			if (hm) fp = GetProcAddress(hm, "CoInternetSetFeatureEnabled");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, CoInternetSetFeatureEnabled)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, (BOOL)arg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jint, jint, BOOL))fp)(arg0, arg1, (BOOL)arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CoInternetSetFeatureEnabled_FUNC);
@@ -1039,7 +919,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CoInternetSetFeatureEnabled)
 
 #ifndef NO_CombineRgn
 JNIEXPORT jint JNICALL OS_NATIVE(CombineRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CombineRgn_FUNC);
@@ -1063,7 +943,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CommDlgExtendedError)
 
 #ifndef NO_CommandBar_1AddAdornments
 JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1AddAdornments)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CommandBar_1AddAdornments_FUNC);
@@ -1074,12 +954,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1AddAdornments)
 #endif
 
 #ifndef NO_CommandBar_1Create
-JNIEXPORT jint JNICALL OS_NATIVE(CommandBar_1Create)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CommandBar_1Create)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CommandBar_1Create_FUNC);
-	rc = (jint)CommandBar_Create((HINSTANCE)arg0, (HWND)arg1, arg2);
+	rc = (jintLong)CommandBar_Create((HINSTANCE)arg0, (HWND)arg1, arg2);
 	OS_NATIVE_EXIT(env, that, CommandBar_1Create_FUNC);
 	return rc;
 }
@@ -1087,7 +967,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CommandBar_1Create)
 
 #ifndef NO_CommandBar_1Destroy
 JNIEXPORT void JNICALL OS_NATIVE(CommandBar_1Destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CommandBar_1Destroy_FUNC);
 	CommandBar_Destroy((HWND)arg0);
@@ -1097,7 +977,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CommandBar_1Destroy)
 
 #ifndef NO_CommandBar_1DrawMenuBar
 JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1DrawMenuBar)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CommandBar_1DrawMenuBar_FUNC);
@@ -1109,7 +989,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1DrawMenuBar)
 
 #ifndef NO_CommandBar_1Height
 JNIEXPORT jint JNICALL OS_NATIVE(CommandBar_1Height)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CommandBar_1Height_FUNC);
@@ -1121,7 +1001,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CommandBar_1Height)
 
 #ifndef NO_CommandBar_1InsertMenubarEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1InsertMenubarEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CommandBar_1InsertMenubarEx_FUNC);
@@ -1133,7 +1013,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1InsertMenubarEx)
 
 #ifndef NO_CommandBar_1Show
 JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1Show)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CommandBar_1Show_FUNC);
@@ -1144,26 +1024,26 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CommandBar_1Show)
 #endif
 
 #ifndef NO_CopyImage
-JNIEXPORT jint JNICALL OS_NATIVE(CopyImage)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CopyImage)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CopyImage_FUNC);
-	rc = (jint)CopyImage((HANDLE)arg0, arg1, arg2, arg3, arg4);
+	rc = (jintLong)CopyImage((HANDLE)arg0, arg1, arg2, arg3, arg4);
 	OS_NATIVE_EXIT(env, that, CopyImage_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateAcceleratorTableA
-JNIEXPORT jint JNICALL OS_NATIVE(CreateAcceleratorTableA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateAcceleratorTableA)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateAcceleratorTableA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)CreateAcceleratorTableA((LPACCEL)lparg0, arg1);
+	rc = (jintLong)CreateAcceleratorTableA((LPACCEL)lparg0, arg1);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, CreateAcceleratorTableA_FUNC);
@@ -1172,14 +1052,14 @@ fail:
 #endif
 
 #ifndef NO_CreateAcceleratorTableW
-JNIEXPORT jint JNICALL OS_NATIVE(CreateAcceleratorTableW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateAcceleratorTableW)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateAcceleratorTableW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)CreateAcceleratorTableW((LPACCEL)lparg0, arg1);
+	rc = (jintLong)CreateAcceleratorTableW((LPACCEL)lparg0, arg1);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, CreateAcceleratorTableW_FUNC);
@@ -1188,28 +1068,20 @@ fail:
 #endif
 
 #ifndef NO_CreateActCtxA
-JNIEXPORT jint JNICALL OS_NATIVE(CreateActCtxA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateActCtxA)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	ACTCTX _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateActCtxA_FUNC);
 	if (arg0) if ((lparg0 = getACTCTXFields(env, arg0, &_arg0)) == NULL) goto fail;
 /*
-	rc = (jint)CreateActCtxA(lparg0);
+	rc = (jintLong)CreateActCtxA(lparg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(CreateActCtxA_LIB);
-			if (hm) fp = GetProcAddress(hm, "CreateActCtxA");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, CreateActCtxA)
 		if (fp) {
-			rc = (jint)fp(lparg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(ACTCTX *))fp)(lparg0);
 		}
 	}
 fail:
@@ -1219,28 +1091,20 @@ fail:
 #endif
 
 #ifndef NO_CreateActCtxW
-JNIEXPORT jint JNICALL OS_NATIVE(CreateActCtxW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateActCtxW)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	ACTCTX _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateActCtxW_FUNC);
 	if (arg0) if ((lparg0 = getACTCTXFields(env, arg0, &_arg0)) == NULL) goto fail;
 /*
-	rc = (jint)CreateActCtxW(lparg0);
+	rc = (jintLong)CreateActCtxW(lparg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(CreateActCtxW_LIB);
-			if (hm) fp = GetProcAddress(hm, "CreateActCtxW");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, CreateActCtxW)
 		if (fp) {
-			rc = (jint)fp(lparg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(ACTCTX *))fp)(lparg0);
 		}
 	}
 fail:
@@ -1250,11 +1114,11 @@ fail:
 #endif
 
 #ifndef NO_CreateBitmap
-JNIEXPORT jint JNICALL OS_NATIVE(CreateBitmap)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateBitmap)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
 {
 	jbyte *lparg4=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateBitmap_FUNC);
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1264,7 +1128,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CreateBitmap)
 	{
 		if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)CreateBitmap(arg0, arg1, arg2, arg3, (CONST VOID *)lparg4);
+	rc = (jintLong)CreateBitmap(arg0, arg1, arg2, arg3, (CONST VOID *)lparg4);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1281,7 +1145,7 @@ fail:
 
 #ifndef NO_CreateCaret
 JNIEXPORT jboolean JNICALL OS_NATIVE(CreateCaret)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateCaret_FUNC);
@@ -1292,36 +1156,36 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(CreateCaret)
 #endif
 
 #ifndef NO_CreateCompatibleBitmap
-JNIEXPORT jint JNICALL OS_NATIVE(CreateCompatibleBitmap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateCompatibleBitmap)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateCompatibleBitmap_FUNC);
-	rc = (jint)CreateCompatibleBitmap((HDC)arg0, arg1, arg2);
+	rc = (jintLong)CreateCompatibleBitmap((HDC)arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, CreateCompatibleBitmap_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateCompatibleDC
-JNIEXPORT jint JNICALL OS_NATIVE(CreateCompatibleDC)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateCompatibleDC)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateCompatibleDC_FUNC);
-	rc = (jint)CreateCompatibleDC((HDC)arg0);
+	rc = (jintLong)CreateCompatibleDC((HDC)arg0);
 	OS_NATIVE_EXIT(env, that, CreateCompatibleDC_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateCursor
-JNIEXPORT jint JNICALL OS_NATIVE(CreateCursor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateCursor)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6)
 {
 	jbyte *lparg5=NULL;
 	jbyte *lparg6=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateCursor_FUNC);
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1333,7 +1197,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CreateCursor)
 		if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail;
 		if (arg6) if ((lparg6 = (*env)->GetByteArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)CreateCursor((HINSTANCE)arg0, arg1, arg2, arg3, arg4, (CONST VOID *)lparg5, (CONST VOID *)lparg6);
+	rc = (jintLong)CreateCursor((HINSTANCE)arg0, arg1, arg2, arg3, arg4, (CONST VOID *)lparg5, (CONST VOID *)lparg6);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1351,16 +1215,16 @@ fail:
 #endif
 
 #ifndef NO_CreateDCA
-JNIEXPORT jint JNICALL OS_NATIVE(CreateDCA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDCA)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateDCA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)CreateDCA((LPSTR)lparg0, (LPSTR)lparg1, (LPSTR)arg2, (CONST DEVMODE *)arg3);
+	rc = (jintLong)CreateDCA((LPSTR)lparg0, (LPSTR)lparg1, (LPSTR)arg2, (CONST DEVMODE *)arg3);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
@@ -1370,16 +1234,16 @@ fail:
 #endif
 
 #ifndef NO_CreateDCW
-JNIEXPORT jint JNICALL OS_NATIVE(CreateDCW)
-	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDCW)
+	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1, jintLong arg2, jintLong arg3)
 {
 	jchar *lparg0=NULL;
 	jchar *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateDCW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)CreateDCW((LPWSTR)lparg0, (LPWSTR)lparg1, (LPWSTR)arg2, (CONST DEVMODEW *)arg3);
+	rc = (jintLong)CreateDCW((LPWSTR)lparg0, (LPWSTR)lparg1, (LPWSTR)arg2, (CONST DEVMODEW *)arg3);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
@@ -1388,22 +1252,29 @@ fail:
 }
 #endif
 
-#ifndef NO_CreateDIBSection__III_3III
-JNIEXPORT jint JNICALL OS_NATIVE(CreateDIBSection__III_3III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4, jint arg5)
+#if (!defined(NO_CreateDIBSection__III_3III) && !defined(JNI64)) || (!defined(NO_CreateDIBSection__JJI_3JJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDIBSection__III_3III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintLong arg4, jint arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDIBSection__JJI_3JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintLong arg4, jint arg5)
+#endif
 {
-	jint *lparg3=NULL;
-	jint rc = 0;
+	jintLong *lparg3=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, CreateDIBSection__III_3III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, CreateDIBSection__JJI_3JJI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
 	} else
 #endif
 	{
-		if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+		if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)CreateDIBSection((HDC)arg0, (BITMAPINFO *)arg1, arg2, (VOID **)lparg3, (HANDLE)arg4, arg5);
+	rc = (jintLong)CreateDIBSection((HDC)arg0, (BITMAPINFO *)arg1, arg2, (VOID **)lparg3, (HANDLE)arg4, arg5);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1411,21 +1282,32 @@ fail:
 	} else
 #endif
 	{
-		if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+		if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, CreateDIBSection__III_3III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, CreateDIBSection__JJI_3JJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_CreateDIBSection__I_3BI_3III
-JNIEXPORT jint JNICALL OS_NATIVE(CreateDIBSection__I_3BI_3III)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintArray arg3, jint arg4, jint arg5)
+#if (!defined(NO_CreateDIBSection__I_3BI_3III) && !defined(JNI64)) || (!defined(NO_CreateDIBSection__J_3BI_3JJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDIBSection__I_3BI_3III)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLongArray arg3, jintLong arg4, jint arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateDIBSection__J_3BI_3JJI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLongArray arg3, jintLong arg4, jint arg5)
+#endif
 {
 	jbyte *lparg1=NULL;
-	jint *lparg3=NULL;
-	jint rc = 0;
+	jintLong *lparg3=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, CreateDIBSection__I_3BI_3III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, CreateDIBSection__J_3BI_3JJI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -1434,9 +1316,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(CreateDIBSection__I_3BI_3III)
 #endif
 	{
 		if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-		if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+		if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)CreateDIBSection((HDC)arg0, (BITMAPINFO *)lparg1, arg2, (VOID **)lparg3, (HANDLE)arg4, arg5);
+	rc = (jintLong)CreateDIBSection((HDC)arg0, (BITMAPINFO *)lparg1, arg2, (VOID **)lparg3, (HANDLE)arg4, arg5);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1445,27 +1327,31 @@ fail:
 	} else
 #endif
 	{
-		if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+		if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 		if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, CreateDIBSection__I_3BI_3III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, CreateDIBSection__J_3BI_3JJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateEnhMetaFileA
-JNIEXPORT jint JNICALL OS_NATIVE(CreateEnhMetaFileA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2, jbyteArray arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateEnhMetaFileA)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jbyteArray arg3)
 {
 	jbyte *lparg1=NULL;
 	RECT _arg2, *lparg2=NULL;
 	jbyte *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateEnhMetaFileA_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)CreateEnhMetaFileA((HDC)arg0, (LPCSTR)lparg1, lparg2, (LPCSTR)lparg3);
+	rc = (jintLong)CreateEnhMetaFileA((HDC)arg0, (LPCSTR)lparg1, lparg2, (LPCSTR)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
@@ -1476,18 +1362,18 @@ fail:
 #endif
 
 #ifndef NO_CreateEnhMetaFileW
-JNIEXPORT jint JNICALL OS_NATIVE(CreateEnhMetaFileW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jobject arg2, jcharArray arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateEnhMetaFileW)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jobject arg2, jcharArray arg3)
 {
 	jchar *lparg1=NULL;
 	RECT _arg2, *lparg2=NULL;
 	jchar *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateEnhMetaFileW_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)CreateEnhMetaFileW((HDC)arg0, (LPCWSTR)lparg1, lparg2, (LPCWSTR)lparg3);
+	rc = (jintLong)CreateEnhMetaFileW((HDC)arg0, (LPCWSTR)lparg1, lparg2, (LPCWSTR)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
@@ -1497,54 +1383,76 @@ fail:
 }
 #endif
 
-#ifndef NO_CreateFontIndirectA__I
-JNIEXPORT jint JNICALL OS_NATIVE(CreateFontIndirectA__I)
-	(JNIEnv *env, jclass that, jint arg0)
+#if (!defined(NO_CreateFontIndirectA__I) && !defined(JNI64)) || (!defined(NO_CreateFontIndirectA__J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectA__I)(JNIEnv *env, jclass that, jintLong arg0)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectA__J)(JNIEnv *env, jclass that, jintLong arg0)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, CreateFontIndirectA__I_FUNC);
-	rc = (jint)CreateFontIndirectA((LPLOGFONTA)arg0);
+#else
+	OS_NATIVE_ENTER(env, that, CreateFontIndirectA__J_FUNC);
+#endif
+	rc = (jintLong)CreateFontIndirectA((LPLOGFONTA)arg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, CreateFontIndirectA__I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, CreateFontIndirectA__J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2
-JNIEXPORT jint JNICALL OS_NATIVE(CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	LOGFONTA _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
 	if (arg0) if ((lparg0 = getLOGFONTAFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)CreateFontIndirectA(lparg0);
+	rc = (jintLong)CreateFontIndirectA(lparg0);
 fail:
 	OS_NATIVE_EXIT(env, that, CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_CreateFontIndirectW__I
-JNIEXPORT jint JNICALL OS_NATIVE(CreateFontIndirectW__I)
-	(JNIEnv *env, jclass that, jint arg0)
+#if (!defined(NO_CreateFontIndirectW__I) && !defined(JNI64)) || (!defined(NO_CreateFontIndirectW__J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectW__I)(JNIEnv *env, jclass that, jintLong arg0)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectW__J)(JNIEnv *env, jclass that, jintLong arg0)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, CreateFontIndirectW__I_FUNC);
-	rc = (jint)CreateFontIndirectW((LPLOGFONTW)arg0);
+#else
+	OS_NATIVE_ENTER(env, that, CreateFontIndirectW__J_FUNC);
+#endif
+	rc = (jintLong)CreateFontIndirectW((LPLOGFONTW)arg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, CreateFontIndirectW__I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, CreateFontIndirectW__J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2
-JNIEXPORT jint JNICALL OS_NATIVE(CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	LOGFONTW _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
 	if (arg0) if ((lparg0 = getLOGFONTWFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)CreateFontIndirectW(lparg0);
+	rc = (jintLong)CreateFontIndirectW(lparg0);
 fail:
 	OS_NATIVE_EXIT(env, that, CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
 	return rc;
@@ -1552,14 +1460,14 @@ fail:
 #endif
 
 #ifndef NO_CreateIconIndirect
-JNIEXPORT jint JNICALL OS_NATIVE(CreateIconIndirect)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateIconIndirect)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	ICONINFO _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateIconIndirect_FUNC);
 	if (arg0) if ((lparg0 = getICONINFOFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)CreateIconIndirect(lparg0);
+	rc = (jintLong)CreateIconIndirect(lparg0);
 fail:
 	OS_NATIVE_EXIT(env, that, CreateIconIndirect_FUNC);
 	return rc;
@@ -1567,23 +1475,23 @@ fail:
 #endif
 
 #ifndef NO_CreateMenu
-JNIEXPORT jint JNICALL OS_NATIVE(CreateMenu)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateMenu)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateMenu_FUNC);
-	rc = (jint)CreateMenu();
+	rc = (jintLong)CreateMenu();
 	OS_NATIVE_EXIT(env, that, CreateMenu_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreatePalette
-JNIEXPORT jint JNICALL OS_NATIVE(CreatePalette)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePalette)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreatePalette_FUNC);
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1593,7 +1501,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CreatePalette)
 	{
 		if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	}
-	rc = (jint)CreatePalette((LOGPALETTE *)lparg0);
+	rc = (jintLong)CreatePalette((LOGPALETTE *)lparg0);
 fail:
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
@@ -1609,38 +1517,38 @@ fail:
 #endif
 
 #ifndef NO_CreatePatternBrush
-JNIEXPORT jint JNICALL OS_NATIVE(CreatePatternBrush)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePatternBrush)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreatePatternBrush_FUNC);
-	rc = (jint)CreatePatternBrush((HBITMAP)arg0);
+	rc = (jintLong)CreatePatternBrush((HBITMAP)arg0);
 	OS_NATIVE_EXIT(env, that, CreatePatternBrush_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreatePen
-JNIEXPORT jint JNICALL OS_NATIVE(CreatePen)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePen)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreatePen_FUNC);
-	rc = (jint)CreatePen(arg0, arg1, (COLORREF)arg2);
+	rc = (jintLong)CreatePen(arg0, arg1, (COLORREF)arg2);
 	OS_NATIVE_EXIT(env, that, CreatePen_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreatePolygonRgn
-JNIEXPORT jint JNICALL OS_NATIVE(CreatePolygonRgn)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePolygonRgn)
 	(JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
 {
 	jint *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreatePolygonRgn_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)CreatePolygonRgn((CONST POINT *)lparg0, arg1, arg2);
+	rc = (jintLong)CreatePolygonRgn((CONST POINT *)lparg0, arg1, arg2);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, CreatePolygonRgn_FUNC);
@@ -1649,12 +1557,12 @@ fail:
 #endif
 
 #ifndef NO_CreatePopupMenu
-JNIEXPORT jint JNICALL OS_NATIVE(CreatePopupMenu)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreatePopupMenu)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreatePopupMenu_FUNC);
-	rc = (jint)CreatePopupMenu();
+	rc = (jintLong)CreatePopupMenu();
 	OS_NATIVE_EXIT(env, that, CreatePopupMenu_FUNC);
 	return rc;
 }
@@ -1662,7 +1570,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CreatePopupMenu)
 
 #ifndef NO_CreateProcessA
 JNIEXPORT jboolean JNICALL OS_NATIVE(CreateProcessA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4, jint arg5, jint arg6, jint arg7, jobject arg8, jobject arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4, jint arg5, jintLong arg6, jintLong arg7, jobject arg8, jobject arg9)
 {
 	STARTUPINFO _arg8, *lparg8=NULL;
 	PROCESS_INFORMATION _arg9, *lparg9=NULL;
@@ -1681,7 +1589,7 @@ fail:
 
 #ifndef NO_CreateProcessW
 JNIEXPORT jboolean JNICALL OS_NATIVE(CreateProcessW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4, jint arg5, jint arg6, jint arg7, jobject arg8, jobject arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4, jint arg5, jintLong arg6, jintLong arg7, jobject arg8, jobject arg9)
 {
 	STARTUPINFO _arg8, *lparg8=NULL;
 	PROCESS_INFORMATION _arg9, *lparg9=NULL;
@@ -1699,24 +1607,24 @@ fail:
 #endif
 
 #ifndef NO_CreateRectRgn
-JNIEXPORT jint JNICALL OS_NATIVE(CreateRectRgn)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateRectRgn)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateRectRgn_FUNC);
-	rc = (jint)CreateRectRgn(arg0, arg1, arg2, arg3);
+	rc = (jintLong)CreateRectRgn(arg0, arg1, arg2, arg3);
 	OS_NATIVE_EXIT(env, that, CreateRectRgn_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateSolidBrush
-JNIEXPORT jint JNICALL OS_NATIVE(CreateSolidBrush)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateSolidBrush)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateSolidBrush_FUNC);
-	rc = (jint)CreateSolidBrush((COLORREF)arg0);
+	rc = (jintLong)CreateSolidBrush((COLORREF)arg0);
 	OS_NATIVE_EXIT(env, that, CreateSolidBrush_FUNC);
 	return rc;
 }
@@ -1724,33 +1632,33 @@ JNIEXPORT jint JNICALL OS_NATIVE(CreateSolidBrush)
 
 #ifndef NO_CreateStreamOnHGlobal
 JNIEXPORT jint JNICALL OS_NATIVE(CreateStreamOnHGlobal)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jintLongArray arg2)
 {
-	jint *lparg2=NULL;
+	jintLong *lparg2=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateStreamOnHGlobal_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	rc = (jint)CreateStreamOnHGlobal((HGLOBAL)arg0, (BOOL)arg1, (LPSTREAM *)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, CreateStreamOnHGlobal_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CreateWindowExA
-JNIEXPORT jint JNICALL OS_NATIVE(CreateWindowExA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jobject arg11)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateWindowExA)
+	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10, jobject arg11)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
 	CREATESTRUCT _arg11, *lparg11=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateWindowExA_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg11) if ((lparg11 = getCREATESTRUCTFields(env, arg11, &_arg11)) == NULL) goto fail;
-	rc = (jint)CreateWindowExA(arg0, (LPSTR)lparg1, lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11);
+	rc = (jintLong)CreateWindowExA(arg0, (LPSTR)lparg1, lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11);
 fail:
 	if (arg11 && lparg11) setCREATESTRUCTFields(env, arg11, lparg11);
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
@@ -1761,18 +1669,18 @@ fail:
 #endif
 
 #ifndef NO_CreateWindowExW
-JNIEXPORT jint JNICALL OS_NATIVE(CreateWindowExW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jobject arg11)
+JNIEXPORT jintLong JNICALL OS_NATIVE(CreateWindowExW)
+	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jintLong arg8, jintLong arg9, jintLong arg10, jobject arg11)
 {
 	jchar *lparg1=NULL;
 	jchar *lparg2=NULL;
 	CREATESTRUCT _arg11, *lparg11=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CreateWindowExW_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg11) if ((lparg11 = getCREATESTRUCTFields(env, arg11, &_arg11)) == NULL) goto fail;
-	rc = (jint)CreateWindowExW(arg0, (LPWSTR)lparg1, (LPWSTR)lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11);
+	rc = (jintLong)CreateWindowExW(arg0, (LPWSTR)lparg1, (LPWSTR)lparg2, arg3, arg4, arg5, arg6, arg7, (HWND)arg8, (HMENU)arg9, (HINSTANCE)arg10, lparg11);
 fail:
 	if (arg11 && lparg11) setCREATESTRUCTFields(env, arg11, lparg11);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
@@ -1832,7 +1740,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DOCINFO_1sizeof)
 
 #ifndef NO_DPtoLP
 JNIEXPORT jboolean JNICALL OS_NATIVE(DPtoLP)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 {
 	POINT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -1883,84 +1791,84 @@ JNIEXPORT jint JNICALL OS_NATIVE(DWM_1BLURBEHIND_1sizeof)
 #endif
 
 #ifndef NO_DefFrameProcA
-JNIEXPORT jint JNICALL OS_NATIVE(DefFrameProcA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefFrameProcA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DefFrameProcA_FUNC);
-	rc = (jint)DefFrameProcA((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4);
+	rc = (jintLong)DefFrameProcA((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4);
 	OS_NATIVE_EXIT(env, that, DefFrameProcA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_DefFrameProcW
-JNIEXPORT jint JNICALL OS_NATIVE(DefFrameProcW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefFrameProcW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DefFrameProcW_FUNC);
-	rc = (jint)DefFrameProcW((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4);
+	rc = (jintLong)DefFrameProcW((HWND)arg0, (HWND)arg1, arg2, (WPARAM)arg3, (LPARAM)arg4);
 	OS_NATIVE_EXIT(env, that, DefFrameProcW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_DefMDIChildProcA
-JNIEXPORT jint JNICALL OS_NATIVE(DefMDIChildProcA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefMDIChildProcA)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DefMDIChildProcA_FUNC);
-	rc = (jint)DefMDIChildProcA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	rc = (jintLong)DefMDIChildProcA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
 	OS_NATIVE_EXIT(env, that, DefMDIChildProcA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_DefMDIChildProcW
-JNIEXPORT jint JNICALL OS_NATIVE(DefMDIChildProcW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefMDIChildProcW)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DefMDIChildProcW_FUNC);
-	rc = (jint)DefMDIChildProcW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	rc = (jintLong)DefMDIChildProcW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
 	OS_NATIVE_EXIT(env, that, DefMDIChildProcW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_DefWindowProcA
-JNIEXPORT jint JNICALL OS_NATIVE(DefWindowProcA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefWindowProcA)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DefWindowProcA_FUNC);
-	rc = (jint)DefWindowProcA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	rc = (jintLong)DefWindowProcA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
 	OS_NATIVE_EXIT(env, that, DefWindowProcA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_DefWindowProcW
-JNIEXPORT jint JNICALL OS_NATIVE(DefWindowProcW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DefWindowProcW)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DefWindowProcW_FUNC);
-	rc = (jint)DefWindowProcW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+	rc = (jintLong)DefWindowProcW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
 	OS_NATIVE_EXIT(env, that, DefWindowProcW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_DeferWindowPos
-JNIEXPORT jint JNICALL OS_NATIVE(DeferWindowPos)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DeferWindowPos)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DeferWindowPos_FUNC);
-	rc = (jint)DeferWindowPos((HDWP)arg0, (HWND)arg1, (HWND)arg2, arg3, arg4, arg5, arg6, arg7);
+	rc = (jintLong)DeferWindowPos((HDWP)arg0, (HWND)arg1, (HWND)arg2, arg3, arg4, arg5, arg6, arg7);
 	OS_NATIVE_EXIT(env, that, DeferWindowPos_FUNC);
 	return rc;
 }
@@ -1968,7 +1876,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(DeferWindowPos)
 
 #ifndef NO_DeleteDC
 JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteDC)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DeleteDC_FUNC);
@@ -1980,7 +1888,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteDC)
 
 #ifndef NO_DeleteEnhMetaFile
 JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteEnhMetaFile)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DeleteEnhMetaFile_FUNC);
@@ -1992,7 +1900,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteEnhMetaFile)
 
 #ifndef NO_DeleteMenu
 JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteMenu)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DeleteMenu_FUNC);
@@ -2004,7 +1912,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteMenu)
 
 #ifndef NO_DeleteObject
 JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteObject)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DeleteObject_FUNC);
@@ -2016,7 +1924,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DeleteObject)
 
 #ifndef NO_DestroyAcceleratorTable
 JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyAcceleratorTable)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DestroyAcceleratorTable_FUNC);
@@ -2040,7 +1948,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyCaret)
 
 #ifndef NO_DestroyCursor
 JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyCursor)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DestroyCursor_FUNC);
@@ -2052,7 +1960,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyCursor)
 
 #ifndef NO_DestroyIcon
 JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyIcon)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DestroyIcon_FUNC);
@@ -2064,7 +1972,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyIcon)
 
 #ifndef NO_DestroyMenu
 JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyMenu)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DestroyMenu_FUNC);
@@ -2076,7 +1984,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyMenu)
 
 #ifndef NO_DestroyWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyWindow)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DestroyWindow_FUNC);
@@ -2087,14 +1995,14 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DestroyWindow)
 #endif
 
 #ifndef NO_DispatchMessageA
-JNIEXPORT jint JNICALL OS_NATIVE(DispatchMessageA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DispatchMessageA)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	MSG _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DispatchMessageA_FUNC);
 	if (arg0) if ((lparg0 = getMSGFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)DispatchMessageA(lparg0);
+	rc = (jintLong)DispatchMessageA(lparg0);
 fail:
 	if (arg0 && lparg0) setMSGFields(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, DispatchMessageA_FUNC);
@@ -2103,14 +2011,14 @@ fail:
 #endif
 
 #ifndef NO_DispatchMessageW
-JNIEXPORT jint JNICALL OS_NATIVE(DispatchMessageW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(DispatchMessageW)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	MSG _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, DispatchMessageW_FUNC);
 	if (arg0) if ((lparg0 = getMSGFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)DispatchMessageW(lparg0);
+	rc = (jintLong)DispatchMessageW(lparg0);
 fail:
 	if (arg0 && lparg0) setMSGFields(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, DispatchMessageW_FUNC);
@@ -2120,7 +2028,7 @@ fail:
 
 #ifndef NO_DragDetect
 JNIEXPORT jboolean JNICALL OS_NATIVE(DragDetect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	POINT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -2136,7 +2044,7 @@ fail:
 
 #ifndef NO_DragFinish
 JNIEXPORT void JNICALL OS_NATIVE(DragFinish)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, DragFinish_FUNC);
 	DragFinish((HDROP)arg0);
@@ -2146,7 +2054,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DragFinish)
 
 #ifndef NO_DragQueryFileA
 JNIEXPORT jint JNICALL OS_NATIVE(DragQueryFileA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
@@ -2162,7 +2070,7 @@ fail:
 
 #ifndef NO_DragQueryFileW
 JNIEXPORT jint JNICALL OS_NATIVE(DragQueryFileW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
@@ -2178,7 +2086,7 @@ fail:
 
 #ifndef NO_DrawAnimatedRects
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawAnimatedRects)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2, jobject arg3)
 {
 	RECT _arg2, *lparg2=NULL;
 	RECT _arg3, *lparg3=NULL;
@@ -2197,7 +2105,7 @@ fail:
 
 #ifndef NO_DrawEdge
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawEdge)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jint arg3)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -2213,7 +2121,7 @@ fail:
 
 #ifndef NO_DrawFocusRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawFocusRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -2229,7 +2137,7 @@ fail:
 
 #ifndef NO_DrawFrameControl
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawFrameControl)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jint arg3)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -2245,7 +2153,7 @@ fail:
 
 #ifndef NO_DrawIconEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawIconEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jint arg4, jint arg5, jint arg6, jintLong arg7, jint arg8)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DrawIconEx_FUNC);
@@ -2257,7 +2165,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DrawIconEx)
 
 #ifndef NO_DrawMenuBar
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawMenuBar)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DrawMenuBar_FUNC);
@@ -2269,7 +2177,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DrawMenuBar)
 
 #ifndef NO_DrawStateA
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawStateA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DrawStateA_FUNC);
@@ -2281,7 +2189,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DrawStateA)
 
 #ifndef NO_DrawStateW
 JNIEXPORT jboolean JNICALL OS_NATIVE(DrawStateW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, DrawStateW_FUNC);
@@ -2293,7 +2201,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(DrawStateW)
 
 #ifndef NO_DrawTextA
 JNIEXPORT jint JNICALL OS_NATIVE(DrawTextA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jobject arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jobject arg3, jint arg4)
 {
 	jbyte *lparg1=NULL;
 	RECT _arg3, *lparg3=NULL;
@@ -2326,7 +2234,7 @@ fail:
 
 #ifndef NO_DrawTextW
 JNIEXPORT jint JNICALL OS_NATIVE(DrawTextW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jobject arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jobject arg3, jint arg4)
 {
 	jchar *lparg1=NULL;
 	RECT _arg3, *lparg3=NULL;
@@ -2359,7 +2267,7 @@ fail:
 
 #ifndef NO_DrawThemeBackground
 JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeBackground)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
 {
 	RECT _arg4, *lparg4=NULL;
 	RECT _arg5, *lparg5=NULL;
@@ -2371,17 +2279,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeBackground)
 	rc = (jint)DrawThemeBackground((HTHEME)arg0, (HDC)arg1, arg2, arg3, (const RECT *)lparg4, (const RECT *)lparg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DrawThemeBackground_LIB);
-			if (hm) fp = GetProcAddress(hm, "DrawThemeBackground");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DrawThemeBackground)
 		if (fp) {
-			rc = (jint)fp((HTHEME)arg0, (HDC)arg1, arg2, arg3, (const RECT *)lparg4, (const RECT *)lparg5);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HTHEME, HDC, jint, jint, const RECT *, const RECT *))fp)((HTHEME)arg0, (HDC)arg1, arg2, arg3, (const RECT *)lparg4, (const RECT *)lparg5);
 		}
 	}
 fail:
@@ -2394,7 +2294,7 @@ fail:
 
 #ifndef NO_DrawThemeEdge
 JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeEdge)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6, jobject arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6, jobject arg7)
 {
 	RECT _arg4, *lparg4=NULL;
 	RECT _arg7, *lparg7=NULL;
@@ -2406,17 +2306,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeEdge)
 	rc = (jint)DrawThemeEdge(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DrawThemeEdge_LIB);
-			if (hm) fp = GetProcAddress(hm, "DrawThemeEdge");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DrawThemeEdge)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7);
 		}
 	}
 fail:
@@ -2429,7 +2321,7 @@ fail:
 
 #ifndef NO_DrawThemeIcon
 JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeIcon)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jint arg6)
 {
 	RECT _arg4, *lparg4=NULL;
 	jint rc = 0;
@@ -2439,17 +2331,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeIcon)
 	rc = (jint)DrawThemeIcon(arg0, arg1, arg2, arg3, lparg4, arg5, arg6);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DrawThemeIcon_LIB);
-			if (hm) fp = GetProcAddress(hm, "DrawThemeIcon");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DrawThemeIcon)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, arg5, arg6);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jintLong, jint))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6);
 		}
 	}
 fail:
@@ -2461,7 +2345,7 @@ fail:
 
 #ifndef NO_DrawThemeParentBackground
 JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeParentBackground)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
 {
 	RECT _arg2, *lparg2=NULL;
 	jint rc = 0;
@@ -2471,17 +2355,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeParentBackground)
 	rc = (jint)DrawThemeParentBackground(arg0, arg1, lparg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DrawThemeParentBackground_LIB);
-			if (hm) fp = GetProcAddress(hm, "DrawThemeParentBackground");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DrawThemeParentBackground)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, lparg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, RECT *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
@@ -2493,7 +2369,7 @@ fail:
 
 #ifndef NO_DrawThemeText
 JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeText)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jint arg7, jobject arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jint arg7, jobject arg8)
 {
 	jchar *lparg4=NULL;
 	RECT _arg8, *lparg8=NULL;
@@ -2505,17 +2381,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DrawThemeText)
 	rc = (jint)DrawThemeText(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DrawThemeText_LIB);
-			if (hm) fp = GetProcAddress(hm, "DrawThemeText");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DrawThemeText)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jchar *, jint, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, arg7, lparg8);
 		}
 	}
 fail:
@@ -2528,7 +2396,7 @@ fail:
 
 #ifndef NO_DwmEnableBlurBehindWindow
 JNIEXPORT jint JNICALL OS_NATIVE(DwmEnableBlurBehindWindow)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	DWM_BLURBEHIND _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -2538,17 +2406,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DwmEnableBlurBehindWindow)
 	rc = (jint)DwmEnableBlurBehindWindow((HWND)arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DwmEnableBlurBehindWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "DwmEnableBlurBehindWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DwmEnableBlurBehindWindow)
 		if (fp) {
-			rc = (jint)fp((HWND)arg0, lparg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HWND, DWM_BLURBEHIND *))fp)((HWND)arg0, lparg1);
 		}
 	}
 fail:
@@ -2560,7 +2420,7 @@ fail:
 
 #ifndef NO_DwmExtendFrameIntoClientArea
 JNIEXPORT jint JNICALL OS_NATIVE(DwmExtendFrameIntoClientArea)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	MARGINS _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -2570,17 +2430,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(DwmExtendFrameIntoClientArea)
 	rc = (jint)DwmExtendFrameIntoClientArea((HWND)arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(DwmExtendFrameIntoClientArea_LIB);
-			if (hm) fp = GetProcAddress(hm, "DwmExtendFrameIntoClientArea");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, DwmExtendFrameIntoClientArea)
 		if (fp) {
-			rc = (jint)fp((HWND)arg0, lparg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HWND, MARGINS *))fp)((HWND)arg0, lparg1);
 		}
 	}
 fail:
@@ -2640,7 +2492,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EXTLOGPEN_1sizeof)
 
 #ifndef NO_Ellipse
 JNIEXPORT jboolean JNICALL OS_NATIVE(Ellipse)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, Ellipse_FUNC);
@@ -2652,7 +2504,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(Ellipse)
 
 #ifndef NO_EnableMenuItem
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnableMenuItem)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnableMenuItem_FUNC);
@@ -2664,7 +2516,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnableMenuItem)
 
 #ifndef NO_EnableScrollBar
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnableScrollBar)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnableScrollBar_FUNC);
@@ -2676,7 +2528,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnableScrollBar)
 
 #ifndef NO_EnableWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnableWindow)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnableWindow_FUNC);
@@ -2688,7 +2540,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnableWindow)
 
 #ifndef NO_EndBufferedPaint
 JNIEXPORT jint JNICALL OS_NATIVE(EndBufferedPaint)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, EndBufferedPaint_FUNC);
@@ -2696,17 +2548,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndBufferedPaint)
 	rc = (jint)EndBufferedPaint((HPAINTBUFFER)arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(EndBufferedPaint_LIB);
-			if (hm) fp = GetProcAddress(hm, "EndBufferedPaint");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, EndBufferedPaint)
 		if (fp) {
-			rc = (jint)fp((HPAINTBUFFER)arg0, arg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HPAINTBUFFER, jboolean))fp)((HPAINTBUFFER)arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, EndBufferedPaint_FUNC);
@@ -2716,7 +2560,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndBufferedPaint)
 
 #ifndef NO_EndDeferWindowPos
 JNIEXPORT jboolean JNICALL OS_NATIVE(EndDeferWindowPos)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EndDeferWindowPos_FUNC);
@@ -2728,7 +2572,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EndDeferWindowPos)
 
 #ifndef NO_EndDoc
 JNIEXPORT jint JNICALL OS_NATIVE(EndDoc)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, EndDoc_FUNC);
@@ -2740,7 +2584,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndDoc)
 
 #ifndef NO_EndPage
 JNIEXPORT jint JNICALL OS_NATIVE(EndPage)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, EndPage_FUNC);
@@ -2752,7 +2596,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(EndPage)
 
 #ifndef NO_EndPaint
 JNIEXPORT jint JNICALL OS_NATIVE(EndPaint)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	PAINTSTRUCT _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -2768,7 +2612,7 @@ fail:
 
 #ifndef NO_EndPath
 JNIEXPORT jboolean JNICALL OS_NATIVE(EndPath)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EndPath_FUNC);
@@ -2780,7 +2624,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EndPath)
 
 #ifndef NO_EnumDisplayMonitors
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnumDisplayMonitors)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jint arg3)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -2790,17 +2634,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumDisplayMonitors)
 	rc = (jboolean)EnumDisplayMonitors((HDC)arg0, (LPCRECT)lparg1, (MONITORENUMPROC)arg2, (LPARAM)arg3);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(EnumDisplayMonitors_LIB);
-			if (hm) fp = GetProcAddress(hm, "EnumDisplayMonitors");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, EnumDisplayMonitors)
 		if (fp) {
-			rc = (jboolean)fp((HDC)arg0, (LPCRECT)lparg1, (MONITORENUMPROC)arg2, (LPARAM)arg3);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HDC, LPCRECT, MONITORENUMPROC, LPARAM))fp)((HDC)arg0, (LPCRECT)lparg1, (MONITORENUMPROC)arg2, (LPARAM)arg3);
 		}
 	}
 fail:
@@ -2812,7 +2648,7 @@ fail:
 
 #ifndef NO_EnumEnhMetaFile
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnumEnhMetaFile)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4)
 {
 	RECT _arg4, *lparg4=NULL;
 	jboolean rc = 0;
@@ -2828,7 +2664,7 @@ fail:
 
 #ifndef NO_EnumFontFamiliesA
 JNIEXPORT jint JNICALL OS_NATIVE(EnumFontFamiliesA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -2844,7 +2680,7 @@ fail:
 
 #ifndef NO_EnumFontFamiliesExA
 JNIEXPORT jint JNICALL OS_NATIVE(EnumFontFamiliesExA)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLong arg3, jint arg4)
 {
 	LOGFONTA _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -2860,7 +2696,7 @@ fail:
 
 #ifndef NO_EnumFontFamiliesExW
 JNIEXPORT jint JNICALL OS_NATIVE(EnumFontFamiliesExW)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLong arg3, jint arg4)
 {
 	LOGFONTW _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -2876,7 +2712,7 @@ fail:
 
 #ifndef NO_EnumFontFamiliesW
 JNIEXPORT jint JNICALL OS_NATIVE(EnumFontFamiliesW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintLong arg3)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
@@ -2892,7 +2728,7 @@ fail:
 
 #ifndef NO_EnumSystemLanguageGroupsA
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnumSystemLanguageGroupsA_FUNC);
@@ -2900,17 +2736,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsA)
 	rc = (jboolean)EnumSystemLanguageGroupsA((LANGUAGEGROUP_ENUMPROCA)arg0, arg1, (LONG_PTR)arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(EnumSystemLanguageGroupsA_LIB);
-			if (hm) fp = GetProcAddress(hm, "EnumSystemLanguageGroupsA");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, EnumSystemLanguageGroupsA)
 		if (fp) {
-			rc = (jboolean)fp((LANGUAGEGROUP_ENUMPROCA)arg0, arg1, (LONG_PTR)arg2);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LANGUAGEGROUP_ENUMPROCA, jint, LONG_PTR))fp)((LANGUAGEGROUP_ENUMPROCA)arg0, arg1, (LONG_PTR)arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, EnumSystemLanguageGroupsA_FUNC);
@@ -2920,7 +2748,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsA)
 
 #ifndef NO_EnumSystemLanguageGroupsW
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnumSystemLanguageGroupsW_FUNC);
@@ -2928,17 +2756,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsW)
 	rc = (jboolean)EnumSystemLanguageGroupsW((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(EnumSystemLanguageGroupsW_LIB);
-			if (hm) fp = GetProcAddress(hm, "EnumSystemLanguageGroupsW");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, EnumSystemLanguageGroupsW)
 		if (fp) {
-			rc = (jboolean)fp((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(LANGUAGEGROUP_ENUMPROCW, jint, LONG_PTR))fp)((LANGUAGEGROUP_ENUMPROCW)arg0, arg1, (LONG_PTR)arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, EnumSystemLanguageGroupsW_FUNC);
@@ -2948,7 +2768,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLanguageGroupsW)
 
 #ifndef NO_EnumSystemLocalesA
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLocalesA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnumSystemLocalesA_FUNC);
@@ -2960,7 +2780,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLocalesA)
 
 #ifndef NO_EnumSystemLocalesW
 JNIEXPORT jboolean JNICALL OS_NATIVE(EnumSystemLocalesW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EnumSystemLocalesW_FUNC);
@@ -2989,7 +2809,7 @@ fail:
 
 #ifndef NO_EqualRgn
 JNIEXPORT jboolean JNICALL OS_NATIVE(EqualRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EqualRgn_FUNC);
@@ -3001,7 +2821,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EqualRgn)
 
 #ifndef NO_ExcludeClipRect
 JNIEXPORT jint JNICALL OS_NATIVE(ExcludeClipRect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ExcludeClipRect_FUNC);
@@ -3050,16 +2870,16 @@ fail:
 #endif
 
 #ifndef NO_ExtCreatePen
-JNIEXPORT jint JNICALL OS_NATIVE(ExtCreatePen)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ExtCreatePen)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jintArray arg4)
 {
 	LOGBRUSH _arg2, *lparg2=NULL;
 	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ExtCreatePen_FUNC);
 	if (arg2) if ((lparg2 = getLOGBRUSHFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)ExtCreatePen(arg0, arg1, (CONST LOGBRUSH *)lparg2, arg3, (CONST DWORD *)lparg4);
+	rc = (jintLong)ExtCreatePen(arg0, arg1, (CONST LOGBRUSH *)lparg2, arg3, (CONST DWORD *)lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
 	if (arg2 && lparg2) setLOGBRUSHFields(env, arg2, lparg2);
@@ -3069,16 +2889,16 @@ fail:
 #endif
 
 #ifndef NO_ExtCreateRegion
-JNIEXPORT jint JNICALL OS_NATIVE(ExtCreateRegion)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ExtCreateRegion)
 	(JNIEnv *env, jclass that, jfloatArray arg0, jint arg1, jintArray arg2)
 {
 	jfloat *lparg0=NULL;
 	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ExtCreateRegion_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetFloatArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)ExtCreateRegion((XFORM *)lparg0, arg1, (CONST RGNDATA *)lparg2);
+	rc = (jintLong)ExtCreateRegion((XFORM *)lparg0, arg1, (CONST RGNDATA *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(env, arg0, lparg0, 0);
@@ -3089,7 +2909,7 @@ fail:
 
 #ifndef NO_ExtTextOutA
 JNIEXPORT jboolean JNICALL OS_NATIVE(ExtTextOutA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jbyteArray arg5, jint arg6, jintArray arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jbyteArray arg5, jint arg6, jintArray arg7)
 {
 	RECT _arg4, *lparg4=NULL;
 	jbyte *lparg5=NULL;
@@ -3126,7 +2946,7 @@ fail:
 
 #ifndef NO_ExtTextOutW
 JNIEXPORT jboolean JNICALL OS_NATIVE(ExtTextOutW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jcharArray arg5, jint arg6, jintArray arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jcharArray arg5, jint arg6, jintArray arg7)
 {
 	RECT _arg4, *lparg4=NULL;
 	jchar *lparg5=NULL;
@@ -3163,20 +2983,20 @@ fail:
 
 #ifndef NO_ExtractIconExA
 JNIEXPORT jint JNICALL OS_NATIVE(ExtractIconExA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintArray arg2, jintArray arg3, jint arg4)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintLongArray arg2, jintLongArray arg3, jint arg4)
 {
 	jbyte *lparg0=NULL;
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ExtractIconExA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	rc = (jint)ExtractIconExA((LPSTR)lparg0, arg1, (HICON FAR *)lparg2, (HICON FAR *)lparg3, arg4);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, ExtractIconExA_FUNC);
 	return rc;
@@ -3185,20 +3005,20 @@ fail:
 
 #ifndef NO_ExtractIconExW
 JNIEXPORT jint JNICALL OS_NATIVE(ExtractIconExW)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintArray arg2, jintArray arg3, jint arg4)
+	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintLongArray arg2, jintLongArray arg3, jint arg4)
 {
 	jchar *lparg0=NULL;
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ExtractIconExW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	rc = (jint)ExtractIconExW((LPWSTR)lparg0, arg1, (HICON FAR *)lparg2, (HICON FAR *)lparg3, arg4);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, ExtractIconExW_FUNC);
 	return rc;
@@ -3219,7 +3039,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(FILETIME_1sizeof)
 
 #ifndef NO_FillPath
 JNIEXPORT jboolean JNICALL OS_NATIVE(FillPath)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, FillPath_FUNC);
@@ -3231,7 +3051,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FillPath)
 
 #ifndef NO_FillRect
 JNIEXPORT jint JNICALL OS_NATIVE(FillRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
 {
 	RECT _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -3245,16 +3065,16 @@ fail:
 #endif
 
 #ifndef NO_FindWindowA
-JNIEXPORT jint JNICALL OS_NATIVE(FindWindowA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(FindWindowA)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, FindWindowA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)FindWindowA((LPSTR)lparg0, (LPSTR)lparg1);
+	rc = (jintLong)FindWindowA((LPSTR)lparg0, (LPSTR)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
@@ -3264,16 +3084,16 @@ fail:
 #endif
 
 #ifndef NO_FindWindowW
-JNIEXPORT jint JNICALL OS_NATIVE(FindWindowW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(FindWindowW)
 	(JNIEnv *env, jclass that, jcharArray arg0, jcharArray arg1)
 {
 	jchar *lparg0=NULL;
 	jchar *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, FindWindowW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)FindWindowW((LPWSTR)lparg0, (LPWSTR)lparg1);
+	rc = (jintLong)FindWindowW((LPWSTR)lparg0, (LPWSTR)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
@@ -3284,15 +3104,15 @@ fail:
 
 #ifndef NO_FormatMessageA
 JNIEXPORT jint JNICALL OS_NATIVE(FormatMessageA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintLongArray arg4, jint arg5, jintLong arg6)
 {
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, FormatMessageA_FUNC);
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)FormatMessageA(arg0, (LPCVOID)arg1, arg2, arg3, (LPSTR)lparg4, arg5, (va_list*)arg6);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	OS_NATIVE_EXIT(env, that, FormatMessageA_FUNC);
 	return rc;
 }
@@ -3300,15 +3120,15 @@ fail:
 
 #ifndef NO_FormatMessageW
 JNIEXPORT jint JNICALL OS_NATIVE(FormatMessageW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintLongArray arg4, jint arg5, jintLong arg6)
 {
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, FormatMessageW_FUNC);
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)FormatMessageW(arg0, (LPCVOID)arg1, arg2, arg3, (LPWSTR)lparg4, arg5, (va_list*)arg6);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	OS_NATIVE_EXIT(env, that, FormatMessageW_FUNC);
 	return rc;
 }
@@ -3316,7 +3136,7 @@ fail:
 
 #ifndef NO_FreeLibrary
 JNIEXPORT jboolean JNICALL OS_NATIVE(FreeLibrary)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, FreeLibrary_FUNC);
@@ -3340,7 +3160,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GCP_1RESULTS_1sizeof)
 
 #ifndef NO_GET_1WHEEL_1DELTA_1WPARAM
 JNIEXPORT jint JNICALL OS_NATIVE(GET_1WHEEL_1DELTA_1WPARAM)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GET_1WHEEL_1DELTA_1WPARAM_FUNC);
@@ -3352,7 +3172,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GET_1WHEEL_1DELTA_1WPARAM)
 
 #ifndef NO_GET_1X_1LPARAM
 JNIEXPORT jint JNICALL OS_NATIVE(GET_1X_1LPARAM)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GET_1X_1LPARAM_FUNC);
@@ -3364,7 +3184,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GET_1X_1LPARAM)
 
 #ifndef NO_GET_1Y_1LPARAM
 JNIEXPORT jint JNICALL OS_NATIVE(GET_1Y_1LPARAM)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GET_1Y_1LPARAM_FUNC);
@@ -3423,12 +3243,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetACP)
 #endif
 
 #ifndef NO_GetActiveWindow
-JNIEXPORT jint JNICALL OS_NATIVE(GetActiveWindow)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetActiveWindow)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetActiveWindow_FUNC);
-	rc = (jint)GetActiveWindow();
+	rc = (jintLong)GetActiveWindow();
 	OS_NATIVE_EXIT(env, that, GetActiveWindow_FUNC);
 	return rc;
 }
@@ -3448,7 +3268,7 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetAsyncKeyState)
 
 #ifndef NO_GetBkColor
 JNIEXPORT jint JNICALL OS_NATIVE(GetBkColor)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetBkColor_FUNC);
@@ -3459,12 +3279,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetBkColor)
 #endif
 
 #ifndef NO_GetCapture
-JNIEXPORT jint JNICALL OS_NATIVE(GetCapture)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetCapture)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetCapture_FUNC);
-	rc = (jint)GetCapture();
+	rc = (jintLong)GetCapture();
 	OS_NATIVE_EXIT(env, that, GetCapture_FUNC);
 	return rc;
 }
@@ -3488,7 +3308,7 @@ fail:
 
 #ifndef NO_GetCharABCWidthsA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharABCWidthsA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jboolean rc = 0;
@@ -3518,7 +3338,7 @@ fail:
 
 #ifndef NO_GetCharABCWidthsW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharABCWidthsW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jboolean rc = 0;
@@ -3548,7 +3368,7 @@ fail:
 
 #ifndef NO_GetCharWidthA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharWidthA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jboolean rc = 0;
@@ -3578,7 +3398,7 @@ fail:
 
 #ifndef NO_GetCharWidthW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetCharWidthW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3)
 {
 	jint *lparg3=NULL;
 	jboolean rc = 0;
@@ -3608,7 +3428,7 @@ fail:
 
 #ifndef NO_GetCharacterPlacementA
 JNIEXPORT jint JNICALL OS_NATIVE(GetCharacterPlacementA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
 {
 	jbyte *lparg1=NULL;
 	GCP_RESULTS _arg4, *lparg4=NULL;
@@ -3641,7 +3461,7 @@ fail:
 
 #ifndef NO_GetCharacterPlacementW
 JNIEXPORT jint JNICALL OS_NATIVE(GetCharacterPlacementW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jobject arg4, jint arg5)
 {
 	jchar *lparg1=NULL;
 	GCP_RESULTS _arg4, *lparg4=NULL;
@@ -3674,7 +3494,7 @@ fail:
 
 #ifndef NO_GetClassInfoA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetClassInfoA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2)
 {
 	jbyte *lparg1=NULL;
 	WNDCLASS _arg2, *lparg2=NULL;
@@ -3693,7 +3513,7 @@ fail:
 
 #ifndef NO_GetClassInfoW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetClassInfoW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jobject arg2)
 {
 	jchar *lparg1=NULL;
 	WNDCLASS _arg2, *lparg2=NULL;
@@ -3712,7 +3532,7 @@ fail:
 
 #ifndef NO_GetClassNameA
 JNIEXPORT jint JNICALL OS_NATIVE(GetClassNameA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -3728,7 +3548,7 @@ fail:
 
 #ifndef NO_GetClassNameW
 JNIEXPORT jint JNICALL OS_NATIVE(GetClassNameW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
@@ -3744,7 +3564,7 @@ fail:
 
 #ifndef NO_GetClientRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetClientRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -3760,7 +3580,7 @@ fail:
 
 #ifndef NO_GetClipBox
 JNIEXPORT jint JNICALL OS_NATIVE(GetClipBox)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RECT _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -3776,7 +3596,7 @@ fail:
 
 #ifndef NO_GetClipRgn
 JNIEXPORT jint JNICALL OS_NATIVE(GetClipRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetClipRgn_FUNC);
@@ -3787,12 +3607,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetClipRgn)
 #endif
 
 #ifndef NO_GetClipboardData
-JNIEXPORT jint JNICALL OS_NATIVE(GetClipboardData)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetClipboardData)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetClipboardData_FUNC);
-	rc = (jint)GetClipboardData(arg0);
+	rc = (jintLong)GetClipboardData(arg0);
 	OS_NATIVE_EXIT(env, that, GetClipboardData_FUNC);
 	return rc;
 }
@@ -3832,7 +3652,7 @@ fail:
 
 #ifndef NO_GetComboBoxInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetComboBoxInfo)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	COMBOBOXINFO _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -3842,17 +3662,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetComboBoxInfo)
 	rc = (jboolean)GetComboBoxInfo((HWND)arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetComboBoxInfo_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetComboBoxInfo");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetComboBoxInfo)
 		if (fp) {
-			rc = (jboolean)fp((HWND)arg0, lparg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, COMBOBOXINFO *))fp)((HWND)arg0, lparg1);
 		}
 	}
 fail:
@@ -3863,12 +3675,12 @@ fail:
 #endif
 
 #ifndef NO_GetCurrentObject
-JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentObject)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetCurrentObject)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetCurrentObject_FUNC);
-	rc = (jint)GetCurrentObject((HDC)arg0, arg1);
+	rc = (jintLong)GetCurrentObject((HDC)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GetCurrentObject_FUNC);
 	return rc;
 }
@@ -3899,12 +3711,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetCurrentThreadId)
 #endif
 
 #ifndef NO_GetCursor
-JNIEXPORT jint JNICALL OS_NATIVE(GetCursor)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetCursor)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetCursor_FUNC);
-	rc = (jint)GetCursor();
+	rc = (jintLong)GetCursor();
 	OS_NATIVE_EXIT(env, that, GetCursor_FUNC);
 	return rc;
 }
@@ -3927,24 +3739,24 @@ fail:
 #endif
 
 #ifndef NO_GetDC
-JNIEXPORT jint JNICALL OS_NATIVE(GetDC)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetDC)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetDC_FUNC);
-	rc = (jint)GetDC((HWND)arg0);
+	rc = (jintLong)GetDC((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, GetDC_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GetDCEx
-JNIEXPORT jint JNICALL OS_NATIVE(GetDCEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetDCEx)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetDCEx_FUNC);
-	rc = (jint)GetDCEx((HWND)arg0, (HRGN)arg1, arg2);
+	rc = (jintLong)GetDCEx((HWND)arg0, (HRGN)arg1, arg2);
 	OS_NATIVE_EXIT(env, that, GetDCEx_FUNC);
 	return rc;
 }
@@ -3952,7 +3764,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDCEx)
 
 #ifndef NO_GetDIBColorTable
 JNIEXPORT jint JNICALL OS_NATIVE(GetDIBColorTable)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jbyteArray arg3)
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
@@ -3982,7 +3794,7 @@ fail:
 
 #ifndef NO_GetDIBits
 JNIEXPORT jint JNICALL OS_NATIVE(GetDIBits)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jint arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4, jbyteArray arg5, jint arg6)
 {
 	jbyte *lparg5=NULL;
 	jint rc = 0;
@@ -4055,12 +3867,12 @@ fail:
 #endif
 
 #ifndef NO_GetDesktopWindow
-JNIEXPORT jint JNICALL OS_NATIVE(GetDesktopWindow)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetDesktopWindow)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetDesktopWindow_FUNC);
-	rc = (jint)GetDesktopWindow();
+	rc = (jintLong)GetDesktopWindow();
 	OS_NATIVE_EXIT(env, that, GetDesktopWindow_FUNC);
 	return rc;
 }
@@ -4068,7 +3880,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDesktopWindow)
 
 #ifndef NO_GetDeviceCaps
 JNIEXPORT jint JNICALL OS_NATIVE(GetDeviceCaps)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetDeviceCaps_FUNC);
@@ -4091,12 +3903,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDialogBaseUnits)
 #endif
 
 #ifndef NO_GetDlgItem
-JNIEXPORT jint JNICALL OS_NATIVE(GetDlgItem)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetDlgItem)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetDlgItem_FUNC);
-	rc = (jint)GetDlgItem((HWND)arg0, arg1);
+	rc = (jintLong)GetDlgItem((HWND)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GetDlgItem_FUNC);
 	return rc;
 }
@@ -4115,12 +3927,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDoubleClickTime)
 #endif
 
 #ifndef NO_GetFocus
-JNIEXPORT jint JNICALL OS_NATIVE(GetFocus)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetFocus)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetFocus_FUNC);
-	rc = (jint)GetFocus();
+	rc = (jintLong)GetFocus();
 	OS_NATIVE_EXIT(env, that, GetFocus_FUNC);
 	return rc;
 }
@@ -4128,7 +3940,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetFocus)
 
 #ifndef NO_GetFontLanguageInfo
 JNIEXPORT jint JNICALL OS_NATIVE(GetFontLanguageInfo)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetFontLanguageInfo_FUNC);
@@ -4139,12 +3951,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetFontLanguageInfo)
 #endif
 
 #ifndef NO_GetForegroundWindow
-JNIEXPORT jint JNICALL OS_NATIVE(GetForegroundWindow)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetForegroundWindow)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetForegroundWindow_FUNC);
-	rc = (jint)GetForegroundWindow();
+	rc = (jintLong)GetForegroundWindow();
 	OS_NATIVE_EXIT(env, that, GetForegroundWindow_FUNC);
 	return rc;
 }
@@ -4168,7 +3980,7 @@ fail:
 
 #ifndef NO_GetIconInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetIconInfo)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	ICONINFO _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -4227,12 +4039,12 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetKeyState)
 #endif
 
 #ifndef NO_GetKeyboardLayout
-JNIEXPORT jint JNICALL OS_NATIVE(GetKeyboardLayout)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetKeyboardLayout)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetKeyboardLayout_FUNC);
-	rc = (jint)GetKeyboardLayout(arg0);
+	rc = (jintLong)GetKeyboardLayout(arg0);
 	OS_NATIVE_EXIT(env, that, GetKeyboardLayout_FUNC);
 	return rc;
 }
@@ -4240,15 +4052,15 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetKeyboardLayout)
 
 #ifndef NO_GetKeyboardLayoutList
 JNIEXPORT jint JNICALL OS_NATIVE(GetKeyboardLayoutList)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jint arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetKeyboardLayoutList_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jint)GetKeyboardLayoutList(arg0, (HKL FAR *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, GetKeyboardLayoutList_FUNC);
 	return rc;
 }
@@ -4271,12 +4083,12 @@ fail:
 #endif
 
 #ifndef NO_GetLastActivePopup
-JNIEXPORT jint JNICALL OS_NATIVE(GetLastActivePopup)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetLastActivePopup)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetLastActivePopup_FUNC);
-	rc = (jint)GetLastActivePopup((HWND)arg0);
+	rc = (jintLong)GetLastActivePopup((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, GetLastActivePopup_FUNC);
 	return rc;
 }
@@ -4296,7 +4108,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetLastError)
 
 #ifndef NO_GetLayeredWindowAttributes
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetLayeredWindowAttributes)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jbyteArray arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jbyteArray arg2, jintArray arg3)
 {
 	jint *lparg1=NULL;
 	jbyte *lparg2=NULL;
@@ -4310,17 +4122,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetLayeredWindowAttributes)
 	rc = (jboolean)GetLayeredWindowAttributes((HWND)arg0, lparg1, lparg2, lparg3);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetLayeredWindowAttributes_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetLayeredWindowAttributes");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetLayeredWindowAttributes)
 		if (fp) {
-			rc = (jboolean)fp((HWND)arg0, lparg1, lparg2, lparg3);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint *, jbyte *, jint *))fp)((HWND)arg0, lparg1, lparg2, lparg3);
 		}
 	}
 fail:
@@ -4334,7 +4138,7 @@ fail:
 
 #ifndef NO_GetLayout
 JNIEXPORT jint JNICALL OS_NATIVE(GetLayout)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetLayout_FUNC);
@@ -4342,17 +4146,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetLayout)
 	rc = (jint)GetLayout((HDC)arg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetLayout_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetLayout");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetLayout)
 		if (fp) {
-			rc = (jint)fp((HDC)arg0);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HDC))fp)((HDC)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, GetLayout_FUNC);
@@ -4394,7 +4190,7 @@ fail:
 
 #ifndef NO_GetMapMode
 JNIEXPORT jint JNICALL OS_NATIVE(GetMapMode)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetMapMode_FUNC);
@@ -4405,12 +4201,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMapMode)
 #endif
 
 #ifndef NO_GetMenu
-JNIEXPORT jint JNICALL OS_NATIVE(GetMenu)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetMenu)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetMenu_FUNC);
-	rc = (jint)GetMenu((HWND)arg0);
+	rc = (jintLong)GetMenu((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, GetMenu_FUNC);
 	return rc;
 }
@@ -4418,7 +4214,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMenu)
 
 #ifndef NO_GetMenuBarInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuBarInfo)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3)
 {
 	MENUBARINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -4428,17 +4224,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuBarInfo)
 	rc = (jboolean)GetMenuBarInfo(arg0, arg1, arg2, lparg3);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetMenuBarInfo_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetMenuBarInfo");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetMenuBarInfo)
 		if (fp) {
-			rc = (jboolean)fp(arg0, arg1, arg2, lparg3);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, MENUBARINFO *))fp)(arg0, arg1, arg2, lparg3);
 		}
 	}
 fail:
@@ -4450,7 +4238,7 @@ fail:
 
 #ifndef NO_GetMenuDefaultItem
 JNIEXPORT jint JNICALL OS_NATIVE(GetMenuDefaultItem)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetMenuDefaultItem_FUNC);
@@ -4462,7 +4250,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMenuDefaultItem)
 
 #ifndef NO_GetMenuInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuInfo)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	MENUINFO _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -4472,17 +4260,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuInfo)
 	rc = (jboolean)GetMenuInfo((HMENU)arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetMenuInfo_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetMenuInfo");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetMenuInfo)
 		if (fp) {
-			rc = (jboolean)fp((HMENU)arg0, lparg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMENU, MENUINFO *))fp)((HMENU)arg0, lparg1);
 		}
 	}
 fail:
@@ -4494,7 +4274,7 @@ fail:
 
 #ifndef NO_GetMenuItemCount
 JNIEXPORT jint JNICALL OS_NATIVE(GetMenuItemCount)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetMenuItemCount_FUNC);
@@ -4506,7 +4286,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMenuItemCount)
 
 #ifndef NO_GetMenuItemInfoA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuItemInfoA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -4522,7 +4302,7 @@ fail:
 
 #ifndef NO_GetMenuItemInfoW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuItemInfoW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -4538,7 +4318,7 @@ fail:
 
 #ifndef NO_GetMenuItemRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMenuItemRect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3)
 {
 	RECT _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -4554,7 +4334,7 @@ fail:
 
 #ifndef NO_GetMessageA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMessageA)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	MSG _arg0, *lparg0=NULL;
 	jboolean rc = 0;
@@ -4594,7 +4374,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMessageTime)
 
 #ifndef NO_GetMessageW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMessageW)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	MSG _arg0, *lparg0=NULL;
 	jboolean rc = 0;
@@ -4610,7 +4390,7 @@ fail:
 
 #ifndef NO_GetMetaRgn
 JNIEXPORT jint JNICALL OS_NATIVE(GetMetaRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetMetaRgn_FUNC);
@@ -4622,7 +4402,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetMetaRgn)
 
 #ifndef NO_GetModuleFileNameA
 JNIEXPORT jint JNICALL OS_NATIVE(GetModuleFileNameA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -4638,7 +4418,7 @@ fail:
 
 #ifndef NO_GetModuleFileNameW
 JNIEXPORT jint JNICALL OS_NATIVE(GetModuleFileNameW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
@@ -4653,14 +4433,14 @@ fail:
 #endif
 
 #ifndef NO_GetModuleHandleA
-JNIEXPORT jint JNICALL OS_NATIVE(GetModuleHandleA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetModuleHandleA)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetModuleHandleA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)GetModuleHandleA((LPSTR)lparg0);
+	rc = (jintLong)GetModuleHandleA((LPSTR)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, GetModuleHandleA_FUNC);
@@ -4669,14 +4449,14 @@ fail:
 #endif
 
 #ifndef NO_GetModuleHandleW
-JNIEXPORT jint JNICALL OS_NATIVE(GetModuleHandleW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetModuleHandleW)
 	(JNIEnv *env, jclass that, jcharArray arg0)
 {
 	jchar *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetModuleHandleW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)GetModuleHandleW((LPWSTR)lparg0);
+	rc = (jintLong)GetModuleHandleW((LPWSTR)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, GetModuleHandleW_FUNC);
@@ -4686,7 +4466,7 @@ fail:
 
 #ifndef NO_GetMonitorInfoA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoA)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	MONITORINFO _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -4696,17 +4476,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoA)
 	rc = (jboolean)GetMonitorInfoA((HMONITOR)arg0, (LPMONITORINFO)lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetMonitorInfoA_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetMonitorInfoA");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetMonitorInfoA)
 		if (fp) {
-			rc = (jboolean)fp((HMONITOR)arg0, (LPMONITORINFO)lparg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMONITOR, LPMONITORINFO))fp)((HMONITOR)arg0, (LPMONITORINFO)lparg1);
 		}
 	}
 fail:
@@ -4718,7 +4490,7 @@ fail:
 
 #ifndef NO_GetMonitorInfoW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoW)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	MONITORINFO _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -4728,17 +4500,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GetMonitorInfoW)
 	rc = (jboolean)GetMonitorInfoW((HMONITOR)arg0, (LPMONITORINFO)lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetMonitorInfoW_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetMonitorInfoW");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetMonitorInfoW)
 		if (fp) {
-			rc = (jboolean)fp((HMONITOR)arg0, (LPMONITORINFO)lparg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMONITOR, LPMONITORINFO))fp)((HMONITOR)arg0, (LPMONITORINFO)lparg1);
 		}
 	}
 fail:
@@ -4750,7 +4514,7 @@ fail:
 
 #ifndef NO_GetNearestPaletteIndex
 JNIEXPORT jint JNICALL OS_NATIVE(GetNearestPaletteIndex)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetNearestPaletteIndex_FUNC);
@@ -4760,218 +4524,372 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetNearestPaletteIndex)
 }
 #endif
 
-#ifndef NO_GetObjectA__III
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_GetObjectA__III) && !defined(JNI64)) || (!defined(NO_GetObjectA__JIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__III)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JIJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JIJ_FUNC);
+#endif
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, (LPVOID)arg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	BITMAP _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setBITMAPFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	DIBSECTION _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setDIBSECTIONFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	EXTLOGPEN _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setEXTLOGPENFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	LOGBRUSH _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGBRUSHFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	LOGFONTA _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGFONTAFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2) && !defined(JNI64)) || (!defined(NO_GetObjectA__JILorg_eclipse_swt_internal_win32_LOGPEN_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectA__JILorg_eclipse_swt_internal_win32_LOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	LOGPEN _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectA((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGPENFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectA__JILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__III
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_GetObjectW__III) && !defined(JNI64)) || (!defined(NO_GetObjectW__JIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__III)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JIJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JIJ_FUNC);
+#endif
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, (LPVOID)arg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JIJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	BITMAP _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setBITMAPFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	DIBSECTION _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setDIBSECTIONFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	EXTLOGPEN _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setEXTLOGPENFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	LOGBRUSH _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGBRUSHFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	LOGFONTW _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGFONTWFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2
-JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2) && !defined(JNI64)) || (!defined(NO_GetObjectW__JILorg_eclipse_swt_internal_win32_LOGPEN_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(GetObjectW__JILorg_eclipse_swt_internal_win32_LOGPEN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+#endif
 {
 	LOGPEN _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	rc = (jint)GetObjectW((HGDIOBJ)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setLOGPENFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, GetObjectW__JILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -5010,7 +4928,7 @@ fail:
 
 #ifndef NO_GetOutlineTextMetricsA
 JNIEXPORT jint JNICALL OS_NATIVE(GetOutlineTextMetricsA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	OUTLINETEXTMETRICA _arg2, *lparg2=NULL;
 	jint rc = 0;
@@ -5026,7 +4944,7 @@ fail:
 
 #ifndef NO_GetOutlineTextMetricsW
 JNIEXPORT jint JNICALL OS_NATIVE(GetOutlineTextMetricsW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	OUTLINETEXTMETRICW _arg2, *lparg2=NULL;
 	jint rc = 0;
@@ -5042,7 +4960,7 @@ fail:
 
 #ifndef NO_GetPaletteEntries
 JNIEXPORT jint JNICALL OS_NATIVE(GetPaletteEntries)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jbyteArray arg3)
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
@@ -5071,12 +4989,12 @@ fail:
 #endif
 
 #ifndef NO_GetParent
-JNIEXPORT jint JNICALL OS_NATIVE(GetParent)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetParent)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetParent_FUNC);
-	rc = (jint)GetParent((HWND)arg0);
+	rc = (jintLong)GetParent((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, GetParent_FUNC);
 	return rc;
 }
@@ -5084,7 +5002,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetParent)
 
 #ifndef NO_GetPath
 JNIEXPORT jint JNICALL OS_NATIVE(GetPath)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jbyteArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jbyteArray arg2, jint arg3)
 {
 	jint *lparg1=NULL;
 	jbyte *lparg2=NULL;
@@ -5103,7 +5021,7 @@ fail:
 
 #ifndef NO_GetPixel
 JNIEXPORT jint JNICALL OS_NATIVE(GetPixel)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetPixel_FUNC);
@@ -5115,7 +5033,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetPixel)
 
 #ifndef NO_GetPolyFillMode
 JNIEXPORT jint JNICALL OS_NATIVE(GetPolyFillMode)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetPolyFillMode_FUNC);
@@ -5126,14 +5044,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetPolyFillMode)
 #endif
 
 #ifndef NO_GetProcAddress
-JNIEXPORT jint JNICALL OS_NATIVE(GetProcAddress)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetProcAddress)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetProcAddress_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)GetProcAddress((HMODULE)arg0, (LPCTSTR)lparg1);
+	rc = (jintLong)GetProcAddress((HMODULE)arg0, (LPCTSTR)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, GetProcAddress_FUNC);
@@ -5142,12 +5060,12 @@ fail:
 #endif
 
 #ifndef NO_GetProcessHeap
-JNIEXPORT jint JNICALL OS_NATIVE(GetProcessHeap)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetProcessHeap)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetProcessHeap_FUNC);
-	rc = (jint)GetProcessHeap();
+	rc = (jintLong)GetProcessHeap();
 	OS_NATIVE_EXIT(env, that, GetProcessHeap_FUNC);
 	return rc;
 }
@@ -5155,15 +5073,15 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetProcessHeap)
 
 #ifndef NO_GetProcessHeaps
 JNIEXPORT jint JNICALL OS_NATIVE(GetProcessHeaps)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jint arg0, jintLongArray arg1)
 {
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetProcessHeaps_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jint)GetProcessHeaps(arg0, (PHANDLE)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, GetProcessHeaps_FUNC);
 	return rc;
 }
@@ -5220,24 +5138,24 @@ fail:
 #endif
 
 #ifndef NO_GetPropA
-JNIEXPORT jint JNICALL OS_NATIVE(GetPropA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetPropA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetPropA_FUNC);
-	rc = (jint)GetPropA((HWND)arg0, (LPCTSTR)arg1);
+	rc = (jintLong)GetPropA((HWND)arg0, (LPCTSTR)arg1);
 	OS_NATIVE_EXIT(env, that, GetPropA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GetPropW
-JNIEXPORT jint JNICALL OS_NATIVE(GetPropW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetPropW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetPropW_FUNC);
-	rc = (jint)GetPropW((HWND)arg0, (LPCWSTR)arg1);
+	rc = (jintLong)GetPropW((HWND)arg0, (LPCWSTR)arg1);
 	OS_NATIVE_EXIT(env, that, GetPropW_FUNC);
 	return rc;
 }
@@ -5245,7 +5163,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetPropW)
 
 #ifndef NO_GetROP2
 JNIEXPORT jint JNICALL OS_NATIVE(GetROP2)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetROP2_FUNC);
@@ -5257,7 +5175,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetROP2)
 
 #ifndef NO_GetRandomRgn
 JNIEXPORT jint JNICALL OS_NATIVE(GetRandomRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetRandomRgn_FUNC);
@@ -5269,7 +5187,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetRandomRgn)
 
 #ifndef NO_GetRegionData
 JNIEXPORT jint JNICALL OS_NATIVE(GetRegionData)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
@@ -5299,7 +5217,7 @@ fail:
 
 #ifndef NO_GetRgnBox
 JNIEXPORT jint JNICALL OS_NATIVE(GetRgnBox)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RECT _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -5347,7 +5265,7 @@ fail:
 
 #ifndef NO_GetScrollBarInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetScrollBarInfo)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	SCROLLBARINFO _arg2, *lparg2=NULL;
 	jboolean rc = 0;
@@ -5363,7 +5281,7 @@ fail:
 
 #ifndef NO_GetScrollInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetScrollInfo)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	SCROLLINFO _arg2, *lparg2=NULL;
 	jboolean rc = 0;
@@ -5406,12 +5324,12 @@ fail:
 #endif
 
 #ifndef NO_GetStockObject
-JNIEXPORT jint JNICALL OS_NATIVE(GetStockObject)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetStockObject)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetStockObject_FUNC);
-	rc = (jint)GetStockObject(arg0);
+	rc = (jintLong)GetStockObject(arg0);
 	OS_NATIVE_EXIT(env, that, GetStockObject_FUNC);
 	return rc;
 }
@@ -5430,12 +5348,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetSysColor)
 #endif
 
 #ifndef NO_GetSysColorBrush
-JNIEXPORT jint JNICALL OS_NATIVE(GetSysColorBrush)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetSysColorBrush)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetSysColorBrush_FUNC);
-	rc = (jint)GetSysColorBrush(arg0);
+	rc = (jintLong)GetSysColorBrush(arg0);
 	OS_NATIVE_EXIT(env, that, GetSysColorBrush_FUNC);
 	return rc;
 }
@@ -5451,17 +5369,9 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetSystemDefaultUILanguage)
 	rc = (jshort)GetSystemDefaultUILanguage();
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetSystemDefaultUILanguage_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetSystemDefaultUILanguage");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetSystemDefaultUILanguage)
 		if (fp) {
-			rc = (jshort)fp();
+			rc = (jshort)((jshort (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, GetSystemDefaultUILanguage_FUNC);
@@ -5470,12 +5380,12 @@ JNIEXPORT jshort JNICALL OS_NATIVE(GetSystemDefaultUILanguage)
 #endif
 
 #ifndef NO_GetSystemMenu
-JNIEXPORT jint JNICALL OS_NATIVE(GetSystemMenu)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetSystemMenu)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetSystemMenu_FUNC);
-	rc = (jint)GetSystemMenu((HWND)arg0, arg1);
+	rc = (jintLong)GetSystemMenu((HWND)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GetSystemMenu_FUNC);
 	return rc;
 }
@@ -5495,7 +5405,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetSystemMetrics)
 
 #ifndef NO_GetSystemPaletteEntries
 JNIEXPORT jint JNICALL OS_NATIVE(GetSystemPaletteEntries)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jbyteArray arg3)
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
@@ -5525,7 +5435,7 @@ fail:
 
 #ifndef NO_GetTextCharset
 JNIEXPORT jint JNICALL OS_NATIVE(GetTextCharset)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetTextCharset_FUNC);
@@ -5537,7 +5447,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetTextCharset)
 
 #ifndef NO_GetTextColor
 JNIEXPORT jint JNICALL OS_NATIVE(GetTextColor)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetTextColor_FUNC);
@@ -5549,7 +5459,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetTextColor)
 
 #ifndef NO_GetTextExtentPoint32A
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextExtentPoint32A)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jobject arg3)
 {
 	jbyte *lparg1=NULL;
 	SIZE _arg3, *lparg3=NULL;
@@ -5582,7 +5492,7 @@ fail:
 
 #ifndef NO_GetTextExtentPoint32W
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextExtentPoint32W)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jobject arg3)
 {
 	jchar *lparg1=NULL;
 	SIZE _arg3, *lparg3=NULL;
@@ -5615,7 +5525,7 @@ fail:
 
 #ifndef NO_GetTextMetricsA
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextMetricsA)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	TEXTMETRICA _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -5631,7 +5541,7 @@ fail:
 
 #ifndef NO_GetTextMetricsW
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetTextMetricsW)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	TEXTMETRICW _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -5647,7 +5557,7 @@ fail:
 
 #ifndef NO_GetThemeBackgroundContentRect
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeBackgroundContentRect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
 {
 	RECT _arg4, *lparg4=NULL;
 	RECT _arg5, *lparg5=NULL;
@@ -5659,17 +5569,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeBackgroundContentRect)
 	rc = (jint)GetThemeBackgroundContentRect(arg0, arg1, arg2, arg3, lparg4, lparg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeBackgroundContentRect_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeBackgroundContentRect");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeBackgroundContentRect)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, lparg5);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, lparg5);
 		}
 	}
 fail:
@@ -5682,7 +5584,7 @@ fail:
 
 #ifndef NO_GetThemeBackgroundExtent
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeBackgroundExtent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jobject arg5)
 {
 	RECT _arg4, *lparg4=NULL;
 	RECT _arg5, *lparg5=NULL;
@@ -5694,17 +5596,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeBackgroundExtent)
 	rc = (jint)GetThemeBackgroundExtent(arg0, arg1, arg2, arg3, lparg4, lparg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeBackgroundExtent_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeBackgroundExtent");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeBackgroundExtent)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, lparg5);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, lparg5);
 		}
 	}
 fail:
@@ -5716,7 +5610,7 @@ fail:
 
 #ifndef NO_GetThemeColor
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeColor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
@@ -5726,17 +5620,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeColor)
 	rc = (jint)GetThemeColor(arg0, arg1, arg2, arg3, lparg4);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeColor_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeColor");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeColor)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint *))fp)(arg0, arg1, arg2, arg3, lparg4);
 		}
 	}
 fail:
@@ -5748,7 +5634,7 @@ fail:
 
 #ifndef NO_GetThemeInt
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeInt)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
@@ -5758,17 +5644,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeInt)
 	rc = (jint)GetThemeInt(arg0, arg1, arg2, arg3, lparg4);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeInt_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeInt");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeInt)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint *))fp)(arg0, arg1, arg2, arg3, lparg4);
 		}
 	}
 fail:
@@ -5780,7 +5658,7 @@ fail:
 
 #ifndef NO_GetThemeMargins
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeMargins)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jobject arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jobject arg6)
 {
 	RECT _arg5, *lparg5=NULL;
 	MARGINS _arg6, *lparg6=NULL;
@@ -5792,17 +5670,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeMargins)
 	rc = (jint)GetThemeMargins(arg0, arg1, arg2, arg3, arg4, lparg5, lparg6);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeMargins_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeMargins");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeMargins)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, arg4, lparg5, lparg6);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jint, RECT *, MARGINS *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5, lparg6);
 		}
 	}
 fail:
@@ -5815,7 +5685,7 @@ fail:
 
 #ifndef NO_GetThemeMetric
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeMetric)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
 {
 	jint *lparg5=NULL;
 	jint rc = 0;
@@ -5825,17 +5695,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeMetric)
 	rc = (jint)GetThemeMetric(arg0, arg1, arg2, arg3, arg4, lparg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeMetric_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeMetric");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeMetric)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, arg4, lparg5);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jint, jint *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5);
 		}
 	}
 fail:
@@ -5847,7 +5709,7 @@ fail:
 
 #ifndef NO_GetThemePartSize
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemePartSize)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jobject arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jobject arg6)
 {
 	RECT _arg4, *lparg4=NULL;
 	SIZE _arg6, *lparg6=NULL;
@@ -5859,17 +5721,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemePartSize)
 	rc = (jint)GetThemePartSize(arg0, arg1, arg2, arg3, lparg4, arg5, lparg6);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemePartSize_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemePartSize");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemePartSize)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, arg5, lparg6);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, RECT *, jint, SIZE *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, lparg6);
 		}
 	}
 fail:
@@ -5882,7 +5736,7 @@ fail:
 
 #ifndef NO_GetThemeRect
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeRect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
 {
 	RECT _arg4, *lparg4=NULL;
 	jint rc = 0;
@@ -5892,17 +5746,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeRect)
 	rc = (jint)GetThemeRect(arg0, arg1, arg2, arg3, lparg4);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeRect_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeRect");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeRect)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jint, jint, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4);
 		}
 	}
 fail:
@@ -5914,7 +5760,7 @@ fail:
 
 #ifndef NO_GetThemeSysSize
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeSysSize)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetThemeSysSize_FUNC);
@@ -5922,17 +5768,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeSysSize)
 	rc = (jint)GetThemeSysSize(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeSysSize_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeSysSize");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeSysSize)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, GetThemeSysSize_FUNC);
@@ -5942,7 +5780,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeSysSize)
 
 #ifndef NO_GetThemeTextExtent
 JNIEXPORT jint JNICALL OS_NATIVE(GetThemeTextExtent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jobject arg7, jobject arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jint arg6, jobject arg7, jobject arg8)
 {
 	jchar *lparg4=NULL;
 	RECT _arg7, *lparg7=NULL;
@@ -5956,17 +5794,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetThemeTextExtent)
 	rc = (jint)GetThemeTextExtent(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetThemeTextExtent_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetThemeTextExtent");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetThemeTextExtent)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jchar *, jint, jint, RECT *, RECT *))fp)(arg0, arg1, arg2, arg3, lparg4, arg5, arg6, lparg7, lparg8);
 		}
 	}
 fail:
@@ -6036,7 +5866,7 @@ fail:
 
 #ifndef NO_GetUpdateRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetUpdateRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -6052,7 +5882,7 @@ fail:
 
 #ifndef NO_GetUpdateRgn
 JNIEXPORT jint JNICALL OS_NATIVE(GetUpdateRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetUpdateRgn_FUNC);
@@ -6127,24 +5957,24 @@ fail:
 #endif
 
 #ifndef NO_GetWindow
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindow)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindow_FUNC);
-	rc = (jint)GetWindow((HWND)arg0, arg1);
+	rc = (jintLong)GetWindow((HWND)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GetWindow_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GetWindowDC
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowDC)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowDC)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowDC_FUNC);
-	rc = (jint)GetWindowDC((HWND)arg0);
+	rc = (jintLong)GetWindowDC((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, GetWindowDC_FUNC);
 	return rc;
 }
@@ -6152,7 +5982,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowDC)
 
 #ifndef NO_GetWindowLongA
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowLongA_FUNC);
@@ -6163,24 +5993,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongA)
 #endif
 
 #ifndef NO_GetWindowLongPtrA
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongPtrA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowLongPtrA)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowLongPtrA_FUNC);
-	rc = (jint)GetWindowLongPtrA((HWND)arg0, arg1);
+	rc = (jintLong)GetWindowLongPtrA((HWND)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GetWindowLongPtrA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GetWindowLongPtrW
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongPtrW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowLongPtrW)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowLongPtrW_FUNC);
-	rc = (jint)GetWindowLongPtrW((HWND)arg0, arg1);
+	rc = (jintLong)GetWindowLongPtrW((HWND)arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GetWindowLongPtrW_FUNC);
 	return rc;
 }
@@ -6188,7 +6018,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongPtrW)
 
 #ifndef NO_GetWindowLongW
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowLongW_FUNC);
@@ -6200,7 +6030,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowLongW)
 
 #ifndef NO_GetWindowOrgEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetWindowOrgEx)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	POINT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -6216,7 +6046,7 @@ fail:
 
 #ifndef NO_GetWindowPlacement
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetWindowPlacement)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	WINDOWPLACEMENT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -6232,7 +6062,7 @@ fail:
 
 #ifndef NO_GetWindowRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetWindowRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -6248,7 +6078,7 @@ fail:
 
 #ifndef NO_GetWindowRgn
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowRgn_FUNC);
@@ -6260,7 +6090,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowRgn)
 
 #ifndef NO_GetWindowTextA
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	jint rc = 0;
@@ -6276,7 +6106,7 @@ fail:
 
 #ifndef NO_GetWindowTextLengthA
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLengthA)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowTextLengthA_FUNC);
@@ -6288,7 +6118,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLengthA)
 
 #ifndef NO_GetWindowTextLengthW
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLengthW)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowTextLengthW_FUNC);
@@ -6300,7 +6130,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextLengthW)
 
 #ifndef NO_GetWindowTextW
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTextW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
 {
 	jchar *lparg1=NULL;
 	jint rc = 0;
@@ -6315,26 +6145,18 @@ fail:
 #endif
 
 #ifndef NO_GetWindowTheme
-JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTheme)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetWindowTheme)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GetWindowTheme_FUNC);
 /*
-	rc = (jint)GetWindowTheme((HWND)arg0);
+	rc = (jintLong)GetWindowTheme((HWND)arg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GetWindowTheme_LIB);
-			if (hm) fp = GetProcAddress(hm, "GetWindowTheme");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GetWindowTheme)
 		if (fp) {
-			rc = (jint)fp((HWND)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HWND))fp)((HWND)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, GetWindowTheme_FUNC);
@@ -6344,7 +6166,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetWindowTheme)
 
 #ifndef NO_GetWindowThreadProcessId
 JNIEXPORT jint JNICALL OS_NATIVE(GetWindowThreadProcessId)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
 {
 	jint *lparg1=NULL;
 	jint rc = 0;
@@ -6360,7 +6182,7 @@ fail:
 
 #ifndef NO_GetWorldTransform
 JNIEXPORT jboolean JNICALL OS_NATIVE(GetWorldTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1)
 {
 	jfloat *lparg1=NULL;
 	jboolean rc = 0;
@@ -6407,36 +6229,36 @@ fail:
 #endif
 
 #ifndef NO_GlobalAlloc
-JNIEXPORT jint JNICALL OS_NATIVE(GlobalAlloc)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GlobalAlloc)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GlobalAlloc_FUNC);
-	rc = (jint)GlobalAlloc(arg0, arg1);
+	rc = (jintLong)GlobalAlloc(arg0, arg1);
 	OS_NATIVE_EXIT(env, that, GlobalAlloc_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GlobalFree
-JNIEXPORT jint JNICALL OS_NATIVE(GlobalFree)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GlobalFree)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GlobalFree_FUNC);
-	rc = (jint)GlobalFree((HANDLE)arg0);
+	rc = (jintLong)GlobalFree((HANDLE)arg0);
 	OS_NATIVE_EXIT(env, that, GlobalFree_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GlobalLock
-JNIEXPORT jint JNICALL OS_NATIVE(GlobalLock)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GlobalLock)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, GlobalLock_FUNC);
-	rc = (jint)GlobalLock((HANDLE)arg0);
+	rc = (jintLong)GlobalLock((HANDLE)arg0);
 	OS_NATIVE_EXIT(env, that, GlobalLock_FUNC);
 	return rc;
 }
@@ -6444,7 +6266,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GlobalLock)
 
 #ifndef NO_GlobalSize
 JNIEXPORT jint JNICALL OS_NATIVE(GlobalSize)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GlobalSize_FUNC);
@@ -6456,7 +6278,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GlobalSize)
 
 #ifndef NO_GlobalUnlock
 JNIEXPORT jboolean JNICALL OS_NATIVE(GlobalUnlock)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, GlobalUnlock_FUNC);
@@ -6468,7 +6290,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GlobalUnlock)
 
 #ifndef NO_GradientFill
 JNIEXPORT jboolean JNICALL OS_NATIVE(GradientFill)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jint arg5)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, GradientFill_FUNC);
@@ -6476,17 +6298,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GradientFill)
 	rc = (jboolean)GradientFill((HDC)arg0, (PTRIVERTEX)arg1, (ULONG)arg2, (PVOID)arg3, (ULONG)arg4, (ULONG)arg5);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(GradientFill_LIB);
-			if (hm) fp = GetProcAddress(hm, "GradientFill");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, GradientFill)
 		if (fp) {
-			rc = (jboolean)fp((HDC)arg0, (PTRIVERTEX)arg1, (ULONG)arg2, (PVOID)arg3, (ULONG)arg4, (ULONG)arg5);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG))fp)((HDC)arg0, (PTRIVERTEX)arg1, (ULONG)arg2, (PVOID)arg3, (ULONG)arg4, (ULONG)arg5);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, GradientFill_FUNC);
@@ -6556,7 +6370,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIGHCONTRAST_1sizeof)
 
 #ifndef NO_HIWORD
 JNIEXPORT jint JNICALL OS_NATIVE(HIWORD)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, HIWORD_FUNC);
@@ -6567,12 +6381,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIWORD)
 #endif
 
 #ifndef NO_HeapAlloc
-JNIEXPORT jint JNICALL OS_NATIVE(HeapAlloc)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(HeapAlloc)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, HeapAlloc_FUNC);
-	rc = (jint)HeapAlloc((HANDLE)arg0, arg1, arg2);
+	rc = (jintLong)HeapAlloc((HANDLE)arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, HeapAlloc_FUNC);
 	return rc;
 }
@@ -6580,7 +6394,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(HeapAlloc)
 
 #ifndef NO_HeapFree
 JNIEXPORT jboolean JNICALL OS_NATIVE(HeapFree)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, HeapFree_FUNC);
@@ -6592,7 +6406,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(HeapFree)
 
 #ifndef NO_HeapValidate
 JNIEXPORT jboolean JNICALL OS_NATIVE(HeapValidate)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, HeapValidate_FUNC);
@@ -6604,7 +6418,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(HeapValidate)
 
 #ifndef NO_HideCaret
 JNIEXPORT jboolean JNICALL OS_NATIVE(HideCaret)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, HideCaret_FUNC);
@@ -6616,7 +6430,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(HideCaret)
 
 #ifndef NO_HitTestThemeBackground
 JNIEXPORT jint JNICALL OS_NATIVE(HitTestThemeBackground)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jobject arg7, jshortArray arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jintLong arg6, jobject arg7, jshortArray arg8)
 {
 	RECT _arg5, *lparg5=NULL;
 	POINT _arg7, *lparg7=NULL;
@@ -6630,17 +6444,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(HitTestThemeBackground)
 	rc = (jint)HitTestThemeBackground(arg0, arg1, arg2, arg3, arg4, lparg5, arg6, *lparg7, lparg8);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(HitTestThemeBackground_LIB);
-			if (hm) fp = GetProcAddress(hm, "HitTestThemeBackground");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, HitTestThemeBackground)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1, arg2, arg3, arg4, lparg5, arg6, *lparg7, lparg8);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jint, RECT *, jintLong, POINT, jshort *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5, arg6, *lparg7, lparg8);
 		}
 	}
 fail:
@@ -6709,7 +6515,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(INPUT_1sizeof)
 
 #ifndef NO_ImageList_1Add
 JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1Add)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1Add_FUNC);
@@ -6721,7 +6527,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1Add)
 
 #ifndef NO_ImageList_1AddMasked
 JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1AddMasked)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1AddMasked_FUNC);
@@ -6733,7 +6539,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1AddMasked)
 
 #ifndef NO_ImageList_1BeginDrag
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1BeginDrag)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1BeginDrag_FUNC);
@@ -6744,12 +6550,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1BeginDrag)
 #endif
 
 #ifndef NO_ImageList_1Create
-JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1Create)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImageList_1Create)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1Create_FUNC);
-	rc = (jint)ImageList_Create(arg0, arg1, arg2, arg3, arg4);
+	rc = (jintLong)ImageList_Create(arg0, arg1, arg2, arg3, arg4);
 	OS_NATIVE_EXIT(env, that, ImageList_1Create_FUNC);
 	return rc;
 }
@@ -6757,7 +6563,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1Create)
 
 #ifndef NO_ImageList_1Destroy
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Destroy)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1Destroy_FUNC);
@@ -6769,7 +6575,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Destroy)
 
 #ifndef NO_ImageList_1DragEnter
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1DragEnter)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1DragEnter_FUNC);
@@ -6781,7 +6587,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1DragEnter)
 
 #ifndef NO_ImageList_1DragLeave
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1DragLeave)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1DragLeave_FUNC);
@@ -6817,7 +6623,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1DragShowNolock)
 
 #ifndef NO_ImageList_1Draw
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Draw)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3, jint arg4, jint arg5)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1Draw_FUNC);
@@ -6838,16 +6644,16 @@ JNIEXPORT void JNICALL OS_NATIVE(ImageList_1EndDrag)
 #endif
 
 #ifndef NO_ImageList_1GetDragImage
-JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1GetDragImage)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImageList_1GetDragImage)
 	(JNIEnv *env, jclass that, jobject arg0, jobject arg1)
 {
 	POINT _arg0, *lparg0=NULL;
 	POINT _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1GetDragImage_FUNC);
 	if (arg0) if ((lparg0 = getPOINTFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getPOINTFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)ImageList_GetDragImage((POINT *)lparg0, (POINT *)lparg1);
+	rc = (jintLong)ImageList_GetDragImage((POINT *)lparg0, (POINT *)lparg1);
 fail:
 	if (arg1 && lparg1) setPOINTFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setPOINTFields(env, arg0, lparg0);
@@ -6857,12 +6663,12 @@ fail:
 #endif
 
 #ifndef NO_ImageList_1GetIcon
-JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1GetIcon)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImageList_1GetIcon)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1GetIcon_FUNC);
-	rc = (jint)ImageList_GetIcon((HIMAGELIST)arg0, arg1, arg2);
+	rc = (jintLong)ImageList_GetIcon((HIMAGELIST)arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, ImageList_1GetIcon_FUNC);
 	return rc;
 }
@@ -6870,7 +6676,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1GetIcon)
 
 #ifndef NO_ImageList_1GetIconSize
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1GetIconSize)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -6889,7 +6695,7 @@ fail:
 
 #ifndef NO_ImageList_1GetImageCount
 JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1GetImageCount)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1GetImageCount_FUNC);
@@ -6901,7 +6707,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1GetImageCount)
 
 #ifndef NO_ImageList_1Remove
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Remove)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1Remove_FUNC);
@@ -6913,7 +6719,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Remove)
 
 #ifndef NO_ImageList_1Replace
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Replace)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1Replace_FUNC);
@@ -6925,7 +6731,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1Replace)
 
 #ifndef NO_ImageList_1ReplaceIcon
 JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1ReplaceIcon)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1ReplaceIcon_FUNC);
@@ -6937,7 +6743,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImageList_1ReplaceIcon)
 
 #ifndef NO_ImageList_1SetIconSize
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1SetIconSize)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImageList_1SetIconSize_FUNC);
@@ -6948,24 +6754,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImageList_1SetIconSize)
 #endif
 
 #ifndef NO_ImmAssociateContext
-JNIEXPORT jint JNICALL OS_NATIVE(ImmAssociateContext)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImmAssociateContext)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmAssociateContext_FUNC);
-	rc = (jint)ImmAssociateContext((HWND)arg0, (HIMC)arg1);
+	rc = (jintLong)ImmAssociateContext((HWND)arg0, (HIMC)arg1);
 	OS_NATIVE_EXIT(env, that, ImmAssociateContext_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_ImmCreateContext
-JNIEXPORT jint JNICALL OS_NATIVE(ImmCreateContext)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImmCreateContext)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmCreateContext_FUNC);
-	rc = (jint)ImmCreateContext();
+	rc = (jintLong)ImmCreateContext();
 	OS_NATIVE_EXIT(env, that, ImmCreateContext_FUNC);
 	return rc;
 }
@@ -6973,7 +6779,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImmCreateContext)
 
 #ifndef NO_ImmDestroyContext
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmDestroyContext)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmDestroyContext_FUNC);
@@ -6993,17 +6799,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmDisableTextFrameService)
 	rc = (jboolean)ImmDisableTextFrameService(arg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(ImmDisableTextFrameService_LIB);
-			if (hm) fp = GetProcAddress(hm, "ImmDisableTextFrameService");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, ImmDisableTextFrameService)
 		if (fp) {
-			rc = (jboolean)fp(arg0);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jint))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, ImmDisableTextFrameService_FUNC);
@@ -7013,7 +6811,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmDisableTextFrameService)
 
 #ifndef NO_ImmGetCompositionFontA
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetCompositionFontA)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	LOGFONTA _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7029,7 +6827,7 @@ fail:
 
 #ifndef NO_ImmGetCompositionFontW
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetCompositionFontW)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	LOGFONTW _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7045,7 +6843,7 @@ fail:
 
 #ifndef NO_ImmGetCompositionStringA
 JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
@@ -7059,45 +6857,67 @@ fail:
 }
 #endif
 
-#ifndef NO_ImmGetCompositionStringW__II_3CI
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__II_3CI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3)
+#if (!defined(NO_ImmGetCompositionStringW__II_3CI) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionStringW__JI_3CI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__II_3CI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__JI_3CI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__II_3CI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__JI_3CI_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	rc = (jint)ImmGetCompositionStringW((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__II_3CI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__JI_3CI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_ImmGetCompositionStringW__II_3II
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__II_3II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3)
+#if (!defined(NO_ImmGetCompositionStringW__II_3II) && !defined(JNI64)) || (!defined(NO_ImmGetCompositionStringW__JI_3II) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jint arg3)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(ImmGetCompositionStringW__JI_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jint arg3)
+#endif
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__II_3II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, ImmGetCompositionStringW__JI_3II_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	rc = (jint)ImmGetCompositionStringW((HIMC)arg0, arg1, (LPWSTR)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__II_3II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, ImmGetCompositionStringW__JI_3II_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_ImmGetContext
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetContext)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImmGetContext)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmGetContext_FUNC);
-	rc = (jint)ImmGetContext((HWND)arg0);
+	rc = (jintLong)ImmGetContext((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, ImmGetContext_FUNC);
 	return rc;
 }
@@ -7105,7 +6925,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImmGetContext)
 
 #ifndef NO_ImmGetConversionStatus
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetConversionStatus)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -7123,12 +6943,12 @@ fail:
 #endif
 
 #ifndef NO_ImmGetDefaultIMEWnd
-JNIEXPORT jint JNICALL OS_NATIVE(ImmGetDefaultIMEWnd)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(ImmGetDefaultIMEWnd)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmGetDefaultIMEWnd_FUNC);
-	rc = (jint)ImmGetDefaultIMEWnd((HWND)arg0);
+	rc = (jintLong)ImmGetDefaultIMEWnd((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, ImmGetDefaultIMEWnd_FUNC);
 	return rc;
 }
@@ -7136,7 +6956,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ImmGetDefaultIMEWnd)
 
 #ifndef NO_ImmGetOpenStatus
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetOpenStatus)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmGetOpenStatus_FUNC);
@@ -7148,7 +6968,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmGetOpenStatus)
 
 #ifndef NO_ImmNotifyIME
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmNotifyIME)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmNotifyIME_FUNC);
@@ -7160,7 +6980,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmNotifyIME)
 
 #ifndef NO_ImmReleaseContext
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmReleaseContext)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmReleaseContext_FUNC);
@@ -7172,7 +6992,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmReleaseContext)
 
 #ifndef NO_ImmSetCandidateWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCandidateWindow)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	CANDIDATEFORM _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7188,7 +7008,7 @@ fail:
 
 #ifndef NO_ImmSetCompositionFontA
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCompositionFontA)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	LOGFONTA _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7204,7 +7024,7 @@ fail:
 
 #ifndef NO_ImmSetCompositionFontW
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCompositionFontW)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	LOGFONTW _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7220,7 +7040,7 @@ fail:
 
 #ifndef NO_ImmSetCompositionWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetCompositionWindow)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	COMPOSITIONFORM _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7236,7 +7056,7 @@ fail:
 
 #ifndef NO_ImmSetConversionStatus
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetConversionStatus)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmSetConversionStatus_FUNC);
@@ -7248,7 +7068,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetConversionStatus)
 
 #ifndef NO_ImmSetOpenStatus
 JNIEXPORT jboolean JNICALL OS_NATIVE(ImmSetOpenStatus)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ImmSetOpenStatus_FUNC);
@@ -7298,7 +7118,7 @@ fail:
 
 #ifndef NO_InsertMenuA
 JNIEXPORT jboolean JNICALL OS_NATIVE(InsertMenuA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jbyteArray arg4)
 {
 	jbyte *lparg4=NULL;
 	jboolean rc = 0;
@@ -7314,7 +7134,7 @@ fail:
 
 #ifndef NO_InsertMenuItemA
 JNIEXPORT jboolean JNICALL OS_NATIVE(InsertMenuItemA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -7330,7 +7150,7 @@ fail:
 
 #ifndef NO_InsertMenuItemW
 JNIEXPORT jboolean JNICALL OS_NATIVE(InsertMenuItemW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -7346,7 +7166,7 @@ fail:
 
 #ifndef NO_InsertMenuW
 JNIEXPORT jboolean JNICALL OS_NATIVE(InsertMenuW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jcharArray arg4)
 {
 	jchar *lparg4=NULL;
 	jboolean rc = 0;
@@ -7362,7 +7182,7 @@ fail:
 
 #ifndef NO_InternetSetOption
 JNIEXPORT jboolean JNICALL OS_NATIVE(InternetSetOption)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, InternetSetOption_FUNC);
@@ -7374,7 +7194,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(InternetSetOption)
 
 #ifndef NO_IntersectClipRect
 JNIEXPORT jint JNICALL OS_NATIVE(IntersectClipRect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, IntersectClipRect_FUNC);
@@ -7406,7 +7226,7 @@ fail:
 
 #ifndef NO_InvalidateRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(InvalidateRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7422,7 +7242,7 @@ fail:
 
 #ifndef NO_InvalidateRgn
 JNIEXPORT jboolean JNICALL OS_NATIVE(InvalidateRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, InvalidateRgn_FUNC);
@@ -7442,17 +7262,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsAppThemed)
 	rc = (jboolean)IsAppThemed();
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(IsAppThemed_LIB);
-			if (hm) fp = GetProcAddress(hm, "IsAppThemed");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, IsAppThemed)
 		if (fp) {
-			rc = (jboolean)fp();
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, IsAppThemed_FUNC);
@@ -7462,7 +7274,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsAppThemed)
 
 #ifndef NO_IsBadReadPtr
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsBadReadPtr)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsBadReadPtr_FUNC);
@@ -7474,7 +7286,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsBadReadPtr)
 
 #ifndef NO_IsBadWritePtr
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsBadWritePtr)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsBadWritePtr_FUNC);
@@ -7498,7 +7310,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsDBCSLeadByte)
 
 #ifndef NO_IsHungAppWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsHungAppWindow)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsHungAppWindow_FUNC);
@@ -7506,17 +7318,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsHungAppWindow)
 	rc = (jboolean)IsHungAppWindow((HWND)arg0);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(IsHungAppWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "IsHungAppWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, IsHungAppWindow)
 		if (fp) {
-			rc = (jboolean)fp((HWND)arg0);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND))fp)((HWND)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, IsHungAppWindow_FUNC);
@@ -7526,7 +7330,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsHungAppWindow)
 
 #ifndef NO_IsIconic
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsIconic)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsIconic_FUNC);
@@ -7538,7 +7342,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsIconic)
 
 #ifndef NO_IsWindowEnabled
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsWindowEnabled)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsWindowEnabled_FUNC);
@@ -7550,7 +7354,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsWindowEnabled)
 
 #ifndef NO_IsWindowVisible
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsWindowVisible)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsWindowVisible_FUNC);
@@ -7562,7 +7366,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsWindowVisible)
 
 #ifndef NO_IsZoomed
 JNIEXPORT jboolean JNICALL OS_NATIVE(IsZoomed)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, IsZoomed_FUNC);
@@ -7586,7 +7390,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(KEYBDINPUT_1sizeof)
 
 #ifndef NO_KillTimer
 JNIEXPORT jboolean JNICALL OS_NATIVE(KillTimer)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, KillTimer_FUNC);
@@ -7658,7 +7462,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LOGPEN_1sizeof)
 
 #ifndef NO_LOWORD
 JNIEXPORT jint JNICALL OS_NATIVE(LOWORD)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, LOWORD_FUNC);
@@ -7670,7 +7474,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LOWORD)
 
 #ifndef NO_LPtoDP
 JNIEXPORT jboolean JNICALL OS_NATIVE(LPtoDP)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
 {
 	POINT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -7722,7 +7526,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LVITEM_1sizeof)
 
 #ifndef NO_LineTo
 JNIEXPORT jboolean JNICALL OS_NATIVE(LineTo)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, LineTo_FUNC);
@@ -7733,142 +7537,186 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(LineTo)
 #endif
 
 #ifndef NO_LoadBitmapA
-JNIEXPORT jint JNICALL OS_NATIVE(LoadBitmapA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadBitmapA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadBitmapA_FUNC);
-	rc = (jint)LoadBitmapA((HINSTANCE)arg0, (LPSTR)arg1);
+	rc = (jintLong)LoadBitmapA((HINSTANCE)arg0, (LPSTR)arg1);
 	OS_NATIVE_EXIT(env, that, LoadBitmapA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_LoadBitmapW
-JNIEXPORT jint JNICALL OS_NATIVE(LoadBitmapW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadBitmapW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadBitmapW_FUNC);
-	rc = (jint)LoadBitmapW((HINSTANCE)arg0, (LPWSTR)arg1);
+	rc = (jintLong)LoadBitmapW((HINSTANCE)arg0, (LPWSTR)arg1);
 	OS_NATIVE_EXIT(env, that, LoadBitmapW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_LoadCursorA
-JNIEXPORT jint JNICALL OS_NATIVE(LoadCursorA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadCursorA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadCursorA_FUNC);
-	rc = (jint)LoadCursorA((HINSTANCE)arg0, (LPSTR)arg1);
+	rc = (jintLong)LoadCursorA((HINSTANCE)arg0, (LPSTR)arg1);
 	OS_NATIVE_EXIT(env, that, LoadCursorA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_LoadCursorW
-JNIEXPORT jint JNICALL OS_NATIVE(LoadCursorW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadCursorW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadCursorW_FUNC);
-	rc = (jint)LoadCursorW((HINSTANCE)arg0, (LPWSTR)arg1);
+	rc = (jintLong)LoadCursorW((HINSTANCE)arg0, (LPWSTR)arg1);
 	OS_NATIVE_EXIT(env, that, LoadCursorW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_LoadIconA
-JNIEXPORT jint JNICALL OS_NATIVE(LoadIconA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadIconA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadIconA_FUNC);
-	rc = (jint)LoadIconA((HINSTANCE)arg0, (LPSTR)arg1);
+	rc = (jintLong)LoadIconA((HINSTANCE)arg0, (LPSTR)arg1);
 	OS_NATIVE_EXIT(env, that, LoadIconA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_LoadIconW
-JNIEXPORT jint JNICALL OS_NATIVE(LoadIconW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadIconW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadIconW_FUNC);
-	rc = (jint)LoadIconW((HINSTANCE)arg0, (LPWSTR)arg1);
+	rc = (jintLong)LoadIconW((HINSTANCE)arg0, (LPWSTR)arg1);
 	OS_NATIVE_EXIT(env, that, LoadIconW_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_LoadImageA__IIIIII
-JNIEXPORT jint JNICALL OS_NATIVE(LoadImageA__IIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO_LoadImageA__IIIIII) && !defined(JNI64)) || (!defined(NO_LoadImageA__JJIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageA__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageA__JJIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, LoadImageA__IIIIII_FUNC);
-	rc = (jint)LoadImageA((HINSTANCE)arg0, (LPSTR)arg1, arg2, arg3, arg4, arg5);
+#else
+	OS_NATIVE_ENTER(env, that, LoadImageA__JJIIII_FUNC);
+#endif
+	rc = (jintLong)LoadImageA((HINSTANCE)arg0, (LPSTR)arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, LoadImageA__IIIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, LoadImageA__JJIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_LoadImageA__I_3BIIII
-JNIEXPORT jint JNICALL OS_NATIVE(LoadImageA__I_3BIIII)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO_LoadImageA__I_3BIIII) && !defined(JNI64)) || (!defined(NO_LoadImageA__J_3BIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageA__I_3BIIII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageA__J_3BIIII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#endif
 {
 	jbyte *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, LoadImageA__I_3BIIII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, LoadImageA__J_3BIIII_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)LoadImageA((HINSTANCE)arg0, (LPSTR)lparg1, arg2, arg3, arg4, arg5);
+	rc = (jintLong)LoadImageA((HINSTANCE)arg0, (LPSTR)lparg1, arg2, arg3, arg4, arg5);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, LoadImageA__I_3BIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, LoadImageA__J_3BIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_LoadImageW__IIIIII
-JNIEXPORT jint JNICALL OS_NATIVE(LoadImageW__IIIIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO_LoadImageW__IIIIII) && !defined(JNI64)) || (!defined(NO_LoadImageW__JJIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageW__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageW__JJIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, LoadImageW__IIIIII_FUNC);
-	rc = (jint)LoadImageW((HINSTANCE)arg0, (LPWSTR)arg1, arg2, arg3, arg4, arg5);
+#else
+	OS_NATIVE_ENTER(env, that, LoadImageW__JJIIII_FUNC);
+#endif
+	rc = (jintLong)LoadImageW((HINSTANCE)arg0, (LPWSTR)arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, LoadImageW__IIIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, LoadImageW__JJIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_LoadImageW__I_3CIIII
-JNIEXPORT jint JNICALL OS_NATIVE(LoadImageW__I_3CIIII)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO_LoadImageW__I_3CIIII) && !defined(JNI64)) || (!defined(NO_LoadImageW__J_3CIIII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageW__I_3CIIII)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadImageW__J_3CIIII)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#endif
 {
 	jchar *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, LoadImageW__I_3CIIII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, LoadImageW__J_3CIIII_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)LoadImageW((HINSTANCE)arg0, (LPWSTR)lparg1, arg2, arg3, arg4, arg5);
+	rc = (jintLong)LoadImageW((HINSTANCE)arg0, (LPWSTR)lparg1, arg2, arg3, arg4, arg5);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, LoadImageW__I_3CIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, LoadImageW__J_3CIIII_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_LoadLibraryA
-JNIEXPORT jint JNICALL OS_NATIVE(LoadLibraryA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadLibraryA)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadLibraryA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)LoadLibraryA((LPSTR)lparg0);
+	rc = (jintLong)LoadLibraryA((LPSTR)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, LoadLibraryA_FUNC);
@@ -7877,14 +7725,14 @@ fail:
 #endif
 
 #ifndef NO_LoadLibraryW
-JNIEXPORT jint JNICALL OS_NATIVE(LoadLibraryW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LoadLibraryW)
 	(JNIEnv *env, jclass that, jcharArray arg0)
 {
 	jchar *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LoadLibraryW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)LoadLibraryW((LPWSTR)lparg0);
+	rc = (jintLong)LoadLibraryW((LPWSTR)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, LoadLibraryW_FUNC);
@@ -7894,7 +7742,7 @@ fail:
 
 #ifndef NO_LoadStringA
 JNIEXPORT jint JNICALL OS_NATIVE(LoadStringA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
 {
 	jbyte *lparg2=NULL;
 	jint rc = 0;
@@ -7910,7 +7758,7 @@ fail:
 
 #ifndef NO_LoadStringW
 JNIEXPORT jint JNICALL OS_NATIVE(LoadStringW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jint arg3)
 {
 	jchar *lparg2=NULL;
 	jint rc = 0;
@@ -7925,12 +7773,12 @@ fail:
 #endif
 
 #ifndef NO_LocalFree
-JNIEXPORT jint JNICALL OS_NATIVE(LocalFree)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(LocalFree)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, LocalFree_FUNC);
-	rc = (jint)LocalFree((HLOCAL)arg0);
+	rc = (jintLong)LocalFree((HLOCAL)arg0);
 	OS_NATIVE_EXIT(env, that, LocalFree_FUNC);
 	return rc;
 }
@@ -7938,7 +7786,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(LocalFree)
 
 #ifndef NO_LockWindowUpdate
 JNIEXPORT jboolean JNICALL OS_NATIVE(LockWindowUpdate)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, LockWindowUpdate_FUNC);
@@ -7949,24 +7797,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(LockWindowUpdate)
 #endif
 
 #ifndef NO_MAKELPARAM
-JNIEXPORT jint JNICALL OS_NATIVE(MAKELPARAM)
+JNIEXPORT jintLong JNICALL OS_NATIVE(MAKELPARAM)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, MAKELPARAM_FUNC);
-	rc = (jint)MAKELPARAM(arg0, arg1);
+	rc = (jintLong)MAKELPARAM(arg0, arg1);
 	OS_NATIVE_EXIT(env, that, MAKELPARAM_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_MAKELRESULT
-JNIEXPORT jint JNICALL OS_NATIVE(MAKELRESULT)
+JNIEXPORT jintLong JNICALL OS_NATIVE(MAKELRESULT)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, MAKELRESULT_FUNC);
-	rc = (jint)MAKELRESULT(arg0, arg1);
+	rc = (jintLong)MAKELRESULT(arg0, arg1);
 	OS_NATIVE_EXIT(env, that, MAKELRESULT_FUNC);
 	return rc;
 }
@@ -7985,12 +7833,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(MAKEWORD)
 #endif
 
 #ifndef NO_MAKEWPARAM
-JNIEXPORT jint JNICALL OS_NATIVE(MAKEWPARAM)
+JNIEXPORT jintLong JNICALL OS_NATIVE(MAKEWPARAM)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, MAKEWPARAM_FUNC);
-	rc = (jint)MAKEWPARAM(arg0, arg1);
+	rc = (jintLong)MAKEWPARAM(arg0, arg1);
 	OS_NATIVE_EXIT(env, that, MAKEWPARAM_FUNC);
 	return rc;
 }
@@ -8030,17 +7878,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(MCIWndRegisterClass)
 	rc = (jboolean)MCIWndRegisterClass();
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(MCIWndRegisterClass_LIB);
-			if (hm) fp = GetProcAddress(hm, "MCIWndRegisterClass");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, MCIWndRegisterClass)
 		if (fp) {
-			rc = (jboolean)fp();
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, MCIWndRegisterClass_FUNC);
@@ -8168,34 +8008,56 @@ JNIEXPORT jint JNICALL OS_NATIVE(MapVirtualKeyW)
 }
 #endif
 
-#ifndef NO_MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I
-JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+#if (!defined(NO_MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I) && !defined(JNI64)) || (!defined(NO_MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3)
+#endif
 {
 	POINT _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getPOINTFields(env, arg2, &_arg2)) == NULL) goto fail;
 	rc = (jint)MapWindowPoints((HWND)arg0, (HWND)arg1, (LPPOINT)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setPOINTFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I
-JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+#if (!defined(NO_MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I) && !defined(JNI64)) || (!defined(NO_MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3)
+#endif
 {
 	RECT _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getRECTFields(env, arg2, &_arg2)) == NULL) goto fail;
 	rc = (jint)MapWindowPoints((HWND)arg0, (HWND)arg1, (LPPOINT)lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setRECTFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -8214,7 +8076,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(MessageBeep)
 
 #ifndef NO_MessageBoxA
 JNIEXPORT jint JNICALL OS_NATIVE(MessageBoxA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
@@ -8233,7 +8095,7 @@ fail:
 
 #ifndef NO_MessageBoxW
 JNIEXPORT jint JNICALL OS_NATIVE(MessageBoxW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jcharArray arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jcharArray arg2, jint arg3)
 {
 	jchar *lparg1=NULL;
 	jchar *lparg2=NULL;
@@ -8251,26 +8113,18 @@ fail:
 #endif
 
 #ifndef NO_MonitorFromWindow
-JNIEXPORT jint JNICALL OS_NATIVE(MonitorFromWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(MonitorFromWindow)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, MonitorFromWindow_FUNC);
 /*
-	rc = (jint)MonitorFromWindow(arg0, arg1);
+	rc = (jintLong)MonitorFromWindow(arg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(MonitorFromWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "MonitorFromWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, MonitorFromWindow)
 		if (fp) {
-			rc = (jint)fp(arg0, arg1);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, MonitorFromWindow_FUNC);
@@ -8278,322 +8132,593 @@ JNIEXPORT jint JNICALL OS_NATIVE(MonitorFromWindow)
 }
 #endif
 
-#ifndef NO_MoveMemory__III
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__III) && !defined(JNI64)) || (!defined(NO_MoveMemory__JJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+#endif
 {
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JJI_FUNC);
+#endif
 	MoveMemory((PVOID)arg0, (CONST VOID *)arg1, arg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JJI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	DOCHOSTUIINFO _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getDOCHOSTUIINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	DROPFILES _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getDROPFILESFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	GRADIENT_RECT _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getGRADIENT_RECTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	KEYBDINPUT _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getKEYBDINPUTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	LOGFONTA _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getLOGFONTAFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	LOGFONTW _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getLOGFONTWFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	MEASUREITEMSTRUCT _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getMEASUREITEMSTRUCTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	MINMAXINFO _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getMINMAXINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	MOUSEINPUT _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getMOUSEINPUTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	MSG _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getMSGFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMLVCUSTOMDRAW _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMLVCUSTOMDRAWFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMLVDISPINFO _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMLVDISPINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMTTCUSTOMDRAW _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMTTCUSTOMDRAWFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMTTDISPINFOA _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMTTDISPINFOAFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMTTDISPINFOW _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMTTDISPINFOWFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMTVCUSTOMDRAW _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMTVCUSTOMDRAWFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	NMTVDISPINFO _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getNMTVDISPINFOFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	OPENFILENAME _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getOPENFILENAMEFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setOPENFILENAMEFields(env, arg1, lparg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	RECT _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getRECTFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	SHDRAGIMAGE _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getSHDRAGIMAGEFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	TRIVERTEX _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getTRIVERTEXFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	UDACCEL _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getUDACCELFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I) && !defined(JNI64)) || (!defined(NO_MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
 {
 	WINDOWPOS _arg1, *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = getWINDOWPOSFields(env, arg1, &_arg1)) == NULL) goto fail;
 	MoveMemory((PVOID)arg0, (CONST VOID *)lparg1, arg2);
 fail:
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3BI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3BI)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3BI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3BI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
+#endif
 {
 	jbyte *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3BI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3BI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8612,16 +8737,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3BI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3BI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3CI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3CI)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3CI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3CI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3CI)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3CI)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2)
+#endif
 {
 	jchar *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3CI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3CI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8640,16 +8776,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3CI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3CI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3DI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3DI)
-	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3DI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3DI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3DI)(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3DI)(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jint arg2)
+#endif
 {
 	jdouble *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3DI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3DI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8668,16 +8815,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3DI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3DI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3FI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3FI)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3FI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3FI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3FI)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3FI)(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1, jint arg2)
+#endif
 {
 	jfloat *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3FI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3FI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8696,16 +8854,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3FI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3FI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3II)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3II) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3II) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3II)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3II)(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2)
+#endif
 {
 	jint *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3II_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8724,16 +8893,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3II_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3JI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3JI)
-	(JNIEnv *env, jclass that, jint arg0, jlongArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3JI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3JI)(JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3JI)(JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1, jint arg2)
+#endif
 {
 	jlong *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3JI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3JI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8752,16 +8932,27 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3JI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__I_3SI
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3SI)
-	(JNIEnv *env, jclass that, jint arg0, jshortArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__I_3SI) && !defined(JNI64)) || (!defined(NO_MoveMemory__J_3SI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__I_3SI)(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__J_3SI)(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1, jint arg2)
+#endif
 {
 	jshort *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__I_3SI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__J_3SI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -8780,21 +8971,36 @@ fail:
 	{
 		if (arg1 && lparg1) (*env)->ReleaseShortArrayElements(env, arg1, lparg1, JNI_ABORT);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__I_3SI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__J_3SI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	BITMAPINFOHEADER _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setBITMAPINFOHEADERFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI_FUNC);
+#endif
 }
 #endif
 
@@ -8829,521 +9035,928 @@ fail:
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	DOCHOSTUIINFO _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setDOCHOSTUIINFOFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	DRAWITEMSTRUCT _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setDRAWITEMSTRUCTFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	EMREXTCREATEFONTINDIRECTW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setEMREXTCREATEFONTINDIRECTWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	EMR _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setEMRFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	EXTLOGPEN _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setEXTLOGPENFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	HDITEM _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setHDITEMFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	HELPINFO _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setHELPINFOFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	LOGFONTA _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setLOGFONTAFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	LOGFONTW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setLOGFONTWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	MEASUREITEMSTRUCT _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setMEASUREITEMSTRUCTFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	MINMAXINFO _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setMINMAXINFOFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	MSG _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setMSGFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMCUSTOMDRAW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMCUSTOMDRAWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMHDR _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMHDRFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMHEADER _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMHEADERFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMLINK _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMLINKFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMLISTVIEW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMLISTVIEWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMLVCUSTOMDRAW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMLVCUSTOMDRAWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMLVDISPINFO _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMLVDISPINFOFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMLVFINDITEM _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMLVFINDITEMFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMLVODSTATECHANGE _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMLVODSTATECHANGEFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMREBARCHEVRON _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMREBARCHEVRONFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMREBARCHILDSIZE _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMREBARCHILDSIZEFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMRGINFO _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMRGINFOFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMTBHOTITEM _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMTBHOTITEMFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMTOOLBAR _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMTOOLBARFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMTREEVIEW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMTREEVIEWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMTTCUSTOMDRAW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMTTCUSTOMDRAWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMTTDISPINFOA _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMTTDISPINFOAFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMTTDISPINFOW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMTTDISPINFOWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMTVCUSTOMDRAW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMTVCUSTOMDRAWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMTVDISPINFO _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMTVDISPINFOFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMTVITEMCHANGE _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMTVITEMCHANGEFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	NMUPDOWN _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNMUPDOWNFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	OFNOTIFY _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getOFNOTIFYFields(env, arg0, &_arg0)) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setOFNOTIFYFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	OPENFILENAME _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getOPENFILENAMEFields(env, arg0, &_arg0)) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setOPENFILENAMEFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	POINT _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setPOINTFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI_FUNC);
+#endif
 }
 #endif
 
@@ -9378,155 +9991,272 @@ fail:
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II)
-	(JNIEnv *env, jclass that, jobject arg0, jintArray arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II)(JNIEnv *env, jclass that, jobject arg0, jintLongArray arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3JI)(JNIEnv *env, jclass that, jobject arg0, jintLongArray arg1, jint arg2)
+#endif
 {
 	RECT _arg0, *lparg0=NULL;
-	jint *lparg1=NULL;
+	jintLong *lparg1=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = getRECTFields(env, arg0, &_arg0)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	MoveMemory(lparg0, lparg1, arg2);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) setRECTFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	SCRIPT_ITEM _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setSCRIPT_ITEMFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	SCRIPT_LOGATTR _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setSCRIPT_LOGATTRFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	SCRIPT_PROPERTIES _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setSCRIPT_PROPERTIESFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	SHDRAGIMAGE _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setSHDRAGIMAGEFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	TEXTMETRICA _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setTEXTMETRICAFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	TEXTMETRICW _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setTEXTMETRICWFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	TVITEM _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setTVITEMFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	UDACCEL _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setUDACCELFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II) && !defined(JNI64)) || (!defined(NO_MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
 {
 	WINDOWPOS _arg0, *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI_FUNC);
+#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	MoveMemory((PVOID)lparg0, (CONST VOID *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setWINDOWPOSFields(env, arg0, lparg0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory___3BII
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3BII)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory___3BII) && !defined(JNI64)) || (!defined(NO_MoveMemory___3BJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3BII)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3BJI)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jbyte *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory___3BII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory___3BJI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -9545,7 +10275,11 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory___3BII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory___3BJI_FUNC);
+#endif
 }
 #endif
 
@@ -9609,12 +10343,19 @@ fail:
 }
 #endif
 
-#ifndef NO_MoveMemory___3CII
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3CII)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory___3CII) && !defined(JNI64)) || (!defined(NO_MoveMemory___3CJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3CII)(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3CJI)(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jchar *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory___3CII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory___3CJI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -9633,16 +10374,27 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory___3CII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory___3CJI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory___3DII
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3DII)
-	(JNIEnv *env, jclass that, jdoubleArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory___3DII) && !defined(JNI64)) || (!defined(NO_MoveMemory___3DJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3DII)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3DJI)(JNIEnv *env, jclass that, jdoubleArray arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jdouble *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory___3DII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory___3DJI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -9661,16 +10413,27 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory___3DII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory___3DJI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory___3FII
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3FII)
-	(JNIEnv *env, jclass that, jfloatArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory___3FII) && !defined(JNI64)) || (!defined(NO_MoveMemory___3FJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3FII)(JNIEnv *env, jclass that, jfloatArray arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3FJI)(JNIEnv *env, jclass that, jfloatArray arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jfloat *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory___3FII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory___3FJI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -9689,16 +10452,27 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory___3FII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory___3FJI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory___3III
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3III)
-	(JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory___3III) && !defined(JNI64)) || (!defined(NO_MoveMemory___3IJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3III)(JNIEnv *env, jclass that, jintArray arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3IJI)(JNIEnv *env, jclass that, jintArray arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jint *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory___3III_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory___3IJI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -9717,16 +10491,27 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory___3III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory___3IJI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory___3JII
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3JII)
-	(JNIEnv *env, jclass that, jlongArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory___3JII) && !defined(JNI64)) || (!defined(NO_MoveMemory___3JJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3JII)(JNIEnv *env, jclass that, jlongArray arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3JJI)(JNIEnv *env, jclass that, jlongArray arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jlong *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory___3JII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory___3JJI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -9745,16 +10530,27 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory___3JII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory___3JJI_FUNC);
+#endif
 }
 #endif
 
-#ifndef NO_MoveMemory___3SII
-JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3SII)
-	(JNIEnv *env, jclass that, jshortArray arg0, jint arg1, jint arg2)
+#if (!defined(NO_MoveMemory___3SII) && !defined(JNI64)) || (!defined(NO_MoveMemory___3SJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3SII)(JNIEnv *env, jclass that, jshortArray arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(MoveMemory___3SJI)(JNIEnv *env, jclass that, jshortArray arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jshort *lparg0=NULL;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MoveMemory___3SII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MoveMemory___3SJI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -9773,13 +10569,17 @@ fail:
 	{
 		if (arg0 && lparg0) (*env)->ReleaseShortArrayElements(env, arg0, lparg0, 0);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MoveMemory___3SII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MoveMemory___3SJI_FUNC);
+#endif
 }
 #endif
 
 #ifndef NO_MoveToEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(MoveToEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, MoveToEx_FUNC);
@@ -9791,7 +10591,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(MoveToEx)
 
 #ifndef NO_MsgWaitForMultipleObjectsEx
 JNIEXPORT jint JNICALL OS_NATIVE(MsgWaitForMultipleObjectsEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, MsgWaitForMultipleObjectsEx_FUNC);
@@ -9801,13 +10601,20 @@ JNIEXPORT jint JNICALL OS_NATIVE(MsgWaitForMultipleObjectsEx)
 }
 #endif
 
-#ifndef NO_MultiByteToWideChar__IIII_3CI
-JNIEXPORT jint JNICALL OS_NATIVE(MultiByteToWideChar__IIII_3CI)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5)
+#if (!defined(NO_MultiByteToWideChar__IIII_3CI) && !defined(JNI64)) || (!defined(NO_MultiByteToWideChar__IIJI_3CI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(MultiByteToWideChar__IIII_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jint arg3, jcharArray arg4, jint arg5)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(MultiByteToWideChar__IIJI_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jint arg3, jcharArray arg4, jint arg5)
+#endif
 {
 	jchar *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, MultiByteToWideChar__IIII_3CI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, MultiByteToWideChar__IIJI_3CI_FUNC);
+#endif
 #ifdef JNI_VERSION_1_2
 	if (IS_JNI_1_2) {
 		if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail;
@@ -9826,7 +10633,11 @@ fail:
 	{
 		if (arg4 && lparg4) (*env)->ReleaseCharArrayElements(env, arg4, lparg4, 0);
 	}
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, MultiByteToWideChar__IIII_3CI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, MultiByteToWideChar__IIJI_3CI_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -10180,23 +10991,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(NOTIFYICONDATAW_1V2_1SIZE)
 
 #ifndef NO_NotifyWinEvent
 JNIEXPORT void JNICALL OS_NATIVE(NotifyWinEvent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	OS_NATIVE_ENTER(env, that, NotifyWinEvent_FUNC);
 /*
 	NotifyWinEvent((DWORD)arg0, (HWND)arg1, (LONG)arg2, (LONG)arg3);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(NotifyWinEvent_LIB);
-			if (hm) fp = GetProcAddress(hm, "NotifyWinEvent");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, NotifyWinEvent)
 		if (fp) {
-			fp((DWORD)arg0, (HWND)arg1, (LONG)arg2, (LONG)arg3);
+			((void (CALLING_CONVENTION*)(DWORD, HWND, LONG, LONG))fp)((DWORD)arg0, (HWND)arg1, (LONG)arg2, (LONG)arg3);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, NotifyWinEvent_FUNC);
@@ -10317,7 +11121,7 @@ fail:
 
 #ifndef NO_OffsetRgn
 JNIEXPORT jint JNICALL OS_NATIVE(OffsetRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, OffsetRgn_FUNC);
@@ -10329,7 +11133,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(OffsetRgn)
 
 #ifndef NO_OleInitialize
 JNIEXPORT jint JNICALL OS_NATIVE(OleInitialize)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, OleInitialize_FUNC);
@@ -10351,7 +11155,7 @@ JNIEXPORT void JNICALL OS_NATIVE(OleUninitialize)
 
 #ifndef NO_OpenClipboard
 JNIEXPORT jboolean JNICALL OS_NATIVE(OpenClipboard)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, OpenClipboard_FUNC);
@@ -10362,28 +11166,20 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(OpenClipboard)
 #endif
 
 #ifndef NO_OpenThemeData
-JNIEXPORT jint JNICALL OS_NATIVE(OpenThemeData)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(OpenThemeData)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1)
 {
 	jchar *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, OpenThemeData_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)OpenThemeData((HWND)arg0, (LPCWSTR)lparg1);
+	rc = (jintLong)OpenThemeData((HWND)arg0, (LPCWSTR)lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(OpenThemeData_LIB);
-			if (hm) fp = GetProcAddress(hm, "OpenThemeData");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, OpenThemeData)
 		if (fp) {
-			rc = (jint)fp((HWND)arg0, (LPCWSTR)lparg1);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(HWND, LPCWSTR))fp)((HWND)arg0, (LPCWSTR)lparg1);
 		}
 	}
 fail:
@@ -10419,7 +11215,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(PANOSE_1sizeof)
 
 #ifndef NO_POINTSTOPOINT
 JNIEXPORT void JNICALL OS_NATIVE(POINTSTOPOINT)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
 {
 	POINT _arg0, *lparg0=NULL;
 	OS_NATIVE_ENTER(env, that, POINTSTOPOINT_FUNC);
@@ -10481,7 +11277,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(PROCESS_1INFORMATION_1sizeof)
 
 #ifndef NO_PatBlt
 JNIEXPORT jboolean JNICALL OS_NATIVE(PatBlt)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, PatBlt_FUNC);
@@ -10493,7 +11289,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PatBlt)
 
 #ifndef NO_PeekMessageA
 JNIEXPORT jboolean JNICALL OS_NATIVE(PeekMessageA)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
 {
 	MSG _arg0, *lparg0=NULL;
 	jboolean rc = 0;
@@ -10509,7 +11305,7 @@ fail:
 
 #ifndef NO_PeekMessageW
 JNIEXPORT jboolean JNICALL OS_NATIVE(PeekMessageW)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
 {
 	MSG _arg0, *lparg0=NULL;
 	jboolean rc = 0;
@@ -10525,7 +11321,7 @@ fail:
 
 #ifndef NO_Pie
 JNIEXPORT jboolean JNICALL OS_NATIVE(Pie)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, Pie_FUNC);
@@ -10537,7 +11333,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(Pie)
 
 #ifndef NO_Polygon
 JNIEXPORT jboolean JNICALL OS_NATIVE(Polygon)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2)
 {
 	jint *lparg1=NULL;
 	jboolean rc = 0;
@@ -10567,7 +11363,7 @@ fail:
 
 #ifndef NO_Polyline
 JNIEXPORT jboolean JNICALL OS_NATIVE(Polyline)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2)
 {
 	jint *lparg1=NULL;
 	jboolean rc = 0;
@@ -10597,7 +11393,7 @@ fail:
 
 #ifndef NO_PostMessageA
 JNIEXPORT jboolean JNICALL OS_NATIVE(PostMessageA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, PostMessageA_FUNC);
@@ -10609,7 +11405,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PostMessageA)
 
 #ifndef NO_PostMessageW
 JNIEXPORT jboolean JNICALL OS_NATIVE(PostMessageW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, PostMessageW_FUNC);
@@ -10621,7 +11417,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PostMessageW)
 
 #ifndef NO_PostThreadMessageA
 JNIEXPORT jboolean JNICALL OS_NATIVE(PostThreadMessageA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, PostThreadMessageA_FUNC);
@@ -10633,7 +11429,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PostThreadMessageA)
 
 #ifndef NO_PostThreadMessageW
 JNIEXPORT jboolean JNICALL OS_NATIVE(PostThreadMessageW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jintLong arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, PostThreadMessageW_FUNC);
@@ -10677,7 +11473,7 @@ fail:
 
 #ifndef NO_PrintWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(PrintWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, PrintWindow_FUNC);
@@ -10685,17 +11481,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PrintWindow)
 	rc = (jboolean)PrintWindow((HWND)arg0, (HDC)arg1, arg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(PrintWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "PrintWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, PrintWindow)
 		if (fp) {
-			rc = (jboolean)fp((HWND)arg0, (HDC)arg1, arg2);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, HDC, jint))fp)((HWND)arg0, (HDC)arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, PrintWindow_FUNC);
@@ -10722,7 +11510,7 @@ fail:
 
 #ifndef NO_PtInRegion
 JNIEXPORT jboolean JNICALL OS_NATIVE(PtInRegion)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, PtInRegion_FUNC);
@@ -10758,7 +11546,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(RECT_1sizeof)
 
 #ifndef NO_RealizePalette
 JNIEXPORT jint JNICALL OS_NATIVE(RealizePalette)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, RealizePalette_FUNC);
@@ -10770,7 +11558,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(RealizePalette)
 
 #ifndef NO_RectInRegion
 JNIEXPORT jboolean JNICALL OS_NATIVE(RectInRegion)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -10785,7 +11573,7 @@ fail:
 
 #ifndef NO_Rectangle
 JNIEXPORT jboolean JNICALL OS_NATIVE(Rectangle)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, Rectangle_FUNC);
@@ -10797,7 +11585,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(Rectangle)
 
 #ifndef NO_RedrawWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(RedrawWindow)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jint arg3)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -10813,7 +11601,7 @@ fail:
 
 #ifndef NO_RegCloseKey
 JNIEXPORT jint JNICALL OS_NATIVE(RegCloseKey)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, RegCloseKey_FUNC);
@@ -10825,7 +11613,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(RegCloseKey)
 
 #ifndef NO_RegEnumKeyExA
 JNIEXPORT jint JNICALL OS_NATIVE(RegEnumKeyExA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jintArray arg4, jbyteArray arg5, jintArray arg6, jobject arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jintArray arg3, jintArray arg4, jbyteArray arg5, jintArray arg6, jobject arg7)
 {
 	jbyte *lparg2=NULL;
 	jint *lparg3=NULL;
@@ -10856,7 +11644,7 @@ fail:
 
 #ifndef NO_RegEnumKeyExW
 JNIEXPORT jint JNICALL OS_NATIVE(RegEnumKeyExW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jintArray arg3, jintArray arg4, jcharArray arg5, jintArray arg6, jobject arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jcharArray arg2, jintArray arg3, jintArray arg4, jcharArray arg5, jintArray arg6, jobject arg7)
 {
 	jchar *lparg2=NULL;
 	jint *lparg3=NULL;
@@ -10887,17 +11675,17 @@ fail:
 
 #ifndef NO_RegOpenKeyExA
 JNIEXPORT jint JNICALL OS_NATIVE(RegOpenKeyExA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3, jintLongArray arg4)
 {
 	jbyte *lparg1=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, RegOpenKeyExA_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)RegOpenKeyExA((HKEY)arg0, (LPSTR)lparg1, arg2, arg3, (PHKEY)lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, RegOpenKeyExA_FUNC);
 	return rc;
@@ -10906,17 +11694,17 @@ fail:
 
 #ifndef NO_RegOpenKeyExW
 JNIEXPORT jint JNICALL OS_NATIVE(RegOpenKeyExW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jintLongArray arg4)
 {
 	jchar *lparg1=NULL;
-	jint *lparg4=NULL;
+	jintLong *lparg4=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, RegOpenKeyExW_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jint)RegOpenKeyExW((HKEY)arg0, (LPWSTR)lparg1, arg2, arg3, (PHKEY)lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, RegOpenKeyExW_FUNC);
 	return rc;
@@ -10925,7 +11713,7 @@ fail:
 
 #ifndef NO_RegQueryInfoKeyA
 JNIEXPORT jint JNICALL OS_NATIVE(RegQueryInfoKeyA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8, jintArray arg9, jintArray arg10, jint arg11)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintLong arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8, jintArray arg9, jintArray arg10, jintLong arg11)
 {
 	jint *lparg2=NULL;
 	jint *lparg4=NULL;
@@ -10962,7 +11750,7 @@ fail:
 
 #ifndef NO_RegQueryInfoKeyW
 JNIEXPORT jint JNICALL OS_NATIVE(RegQueryInfoKeyW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8, jintArray arg9, jintArray arg10, jint arg11)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintLong arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8, jintArray arg9, jintArray arg10, jintLong arg11)
 {
 	jint *lparg2=NULL;
 	jint *lparg4=NULL;
@@ -10997,16 +11785,23 @@ fail:
 }
 #endif
 
-#ifndef NO_RegQueryValueExA__I_3BI_3I_3B_3I
-JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExA__I_3BI_3I_3B_3I)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintArray arg3, jbyteArray arg4, jintArray arg5)
+#if (!defined(NO_RegQueryValueExA__I_3BI_3I_3B_3I) && !defined(JNI64)) || (!defined(NO_RegQueryValueExA__J_3BJ_3I_3B_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExA__I_3BI_3I_3B_3I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintArray arg3, jbyteArray arg4, jintArray arg5)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExA__J_3BJ_3I_3B_3I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintArray arg3, jbyteArray arg4, jintArray arg5)
+#endif
 {
 	jbyte *lparg1=NULL;
 	jint *lparg3=NULL;
 	jbyte *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, RegQueryValueExA__I_3BI_3I_3B_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, RegQueryValueExA__J_3BJ_3I_3B_3I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
@@ -11017,21 +11812,32 @@ fail:
 	if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, RegQueryValueExA__I_3BI_3I_3B_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, RegQueryValueExA__J_3BJ_3I_3B_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_RegQueryValueExA__I_3BI_3I_3I_3I
-JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExA__I_3BI_3I_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#if (!defined(NO_RegQueryValueExA__I_3BI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_RegQueryValueExA__J_3BJ_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExA__I_3BI_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExA__J_3BJ_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#endif
 {
 	jbyte *lparg1=NULL;
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, RegQueryValueExA__I_3BI_3I_3I_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, RegQueryValueExA__J_3BJ_3I_3I_3I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
@@ -11042,21 +11848,32 @@ fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, RegQueryValueExA__I_3BI_3I_3I_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, RegQueryValueExA__J_3BJ_3I_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_RegQueryValueExW__I_3CI_3I_3C_3I
-JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExW__I_3CI_3I_3C_3I)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jintArray arg3, jcharArray arg4, jintArray arg5)
+#if (!defined(NO_RegQueryValueExW__I_3CI_3I_3C_3I) && !defined(JNI64)) || (!defined(NO_RegQueryValueExW__J_3CJ_3I_3C_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExW__I_3CI_3I_3C_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jcharArray arg4, jintArray arg5)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExW__J_3CJ_3I_3C_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jcharArray arg4, jintArray arg5)
+#endif
 {
 	jchar *lparg1=NULL;
 	jint *lparg3=NULL;
 	jchar *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, RegQueryValueExW__I_3CI_3I_3C_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, RegQueryValueExW__J_3CJ_3I_3C_3I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetCharArrayElements(env, arg4, NULL)) == NULL) goto fail;
@@ -11067,21 +11884,32 @@ fail:
 	if (arg4 && lparg4) (*env)->ReleaseCharArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, RegQueryValueExW__I_3CI_3I_3C_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, RegQueryValueExW__J_3CJ_3I_3C_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_RegQueryValueExW__I_3CI_3I_3I_3I
-JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExW__I_3CI_3I_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#if (!defined(NO_RegQueryValueExW__I_3CI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO_RegQueryValueExW__J_3CJ_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExW__I_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(RegQueryValueExW__J_3CJ_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#endif
 {
 	jchar *lparg1=NULL;
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, RegQueryValueExW__I_3CI_3I_3I_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, RegQueryValueExW__J_3CJ_3I_3I_3I_FUNC);
+#endif
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
@@ -11092,7 +11920,11 @@ fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, RegQueryValueExW__I_3CI_3I_3I_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, RegQueryValueExW__J_3CJ_3I_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -11207,7 +12039,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ReleaseCapture)
 
 #ifndef NO_ReleaseDC
 JNIEXPORT jint JNICALL OS_NATIVE(ReleaseDC)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ReleaseDC_FUNC);
@@ -11219,7 +12051,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ReleaseDC)
 
 #ifndef NO_RemoveMenu
 JNIEXPORT jboolean JNICALL OS_NATIVE(RemoveMenu)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, RemoveMenu_FUNC);
@@ -11230,24 +12062,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RemoveMenu)
 #endif
 
 #ifndef NO_RemovePropA
-JNIEXPORT jint JNICALL OS_NATIVE(RemovePropA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(RemovePropA)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, RemovePropA_FUNC);
-	rc = (jint)RemovePropA((HWND)arg0, (LPCTSTR)arg1);
+	rc = (jintLong)RemovePropA((HWND)arg0, (LPCTSTR)arg1);
 	OS_NATIVE_EXIT(env, that, RemovePropA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_RemovePropW
-JNIEXPORT jint JNICALL OS_NATIVE(RemovePropW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(RemovePropW)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, RemovePropW_FUNC);
-	rc = (jint)RemovePropW((HWND)arg0, (LPCWSTR)arg1);
+	rc = (jintLong)RemovePropW((HWND)arg0, (LPCWSTR)arg1);
 	OS_NATIVE_EXIT(env, that, RemovePropW_FUNC);
 	return rc;
 }
@@ -11255,7 +12087,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(RemovePropW)
 
 #ifndef NO_ReplyMessage
 JNIEXPORT jboolean JNICALL OS_NATIVE(ReplyMessage)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ReplyMessage_FUNC);
@@ -11267,7 +12099,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ReplyMessage)
 
 #ifndef NO_RestoreDC
 JNIEXPORT jboolean JNICALL OS_NATIVE(RestoreDC)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, RestoreDC_FUNC);
@@ -11279,7 +12111,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RestoreDC)
 
 #ifndef NO_RoundRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(RoundRect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, RoundRect_FUNC);
@@ -11434,14 +12266,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(SHACTIVATEINFO_1sizeof)
 #endif
 
 #ifndef NO_SHBrowseForFolderA
-JNIEXPORT jint JNICALL OS_NATIVE(SHBrowseForFolderA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SHBrowseForFolderA)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	BROWSEINFO _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SHBrowseForFolderA_FUNC);
 	if (arg0) if ((lparg0 = getBROWSEINFOFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)SHBrowseForFolderA(lparg0);
+	rc = (jintLong)SHBrowseForFolderA(lparg0);
 fail:
 	if (arg0 && lparg0) setBROWSEINFOFields(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, SHBrowseForFolderA_FUNC);
@@ -11450,14 +12282,14 @@ fail:
 #endif
 
 #ifndef NO_SHBrowseForFolderW
-JNIEXPORT jint JNICALL OS_NATIVE(SHBrowseForFolderW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SHBrowseForFolderW)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	BROWSEINFO _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SHBrowseForFolderW_FUNC);
 	if (arg0) if ((lparg0 = getBROWSEINFOFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)SHBrowseForFolderW((LPBROWSEINFOW)lparg0);
+	rc = (jintLong)SHBrowseForFolderW((LPBROWSEINFOW)lparg0);
 fail:
 	if (arg0 && lparg0) setBROWSEINFOFields(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, SHBrowseForFolderW_FUNC);
@@ -11530,16 +12362,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(SHFILEINFOW_1sizeof)
 #endif
 
 #ifndef NO_SHGetFileInfoA
-JNIEXPORT jint JNICALL OS_NATIVE(SHGetFileInfoA)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SHGetFileInfoA)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jobject arg2, jint arg3, jint arg4)
 {
 	jbyte *lparg0=NULL;
 	SHFILEINFOA _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SHGetFileInfoA_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getSHFILEINFOAFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)SHGetFileInfoA((LPCSTR)lparg0, arg1, (SHFILEINFOA *)lparg2, arg3, arg4);
+	rc = (jintLong)SHGetFileInfoA((LPCSTR)lparg0, arg1, (SHFILEINFOA *)lparg2, arg3, arg4);
 fail:
 	if (arg2 && lparg2) setSHFILEINFOAFields(env, arg2, lparg2);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
@@ -11549,16 +12381,16 @@ fail:
 #endif
 
 #ifndef NO_SHGetFileInfoW
-JNIEXPORT jint JNICALL OS_NATIVE(SHGetFileInfoW)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SHGetFileInfoW)
 	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jobject arg2, jint arg3, jint arg4)
 {
 	jchar *lparg0=NULL;
 	SHFILEINFOW _arg2, *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SHGetFileInfoW_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getSHFILEINFOWFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)SHGetFileInfoW((LPCWSTR)lparg0, arg1, (SHFILEINFOW *)lparg2, arg3, arg4);
+	rc = (jintLong)SHGetFileInfoW((LPCWSTR)lparg0, arg1, (SHFILEINFOW *)lparg2, arg3, arg4);
 fail:
 	if (arg2 && lparg2) setSHFILEINFOWFields(env, arg2, lparg2);
 	if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
@@ -11569,15 +12401,15 @@ fail:
 
 #ifndef NO_SHGetMalloc
 JNIEXPORT jint JNICALL OS_NATIVE(SHGetMalloc)
-	(JNIEnv *env, jclass that, jintArray arg0)
+	(JNIEnv *env, jclass that, jintLongArray arg0)
 {
-	jint *lparg0=NULL;
+	jintLong *lparg0=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SHGetMalloc_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jint)SHGetMalloc((LPMALLOC *)lparg0);
 fail:
-	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
+	if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, SHGetMalloc_FUNC);
 	return rc;
 }
@@ -11585,7 +12417,7 @@ fail:
 
 #ifndef NO_SHGetPathFromIDListA
 JNIEXPORT jboolean JNICALL OS_NATIVE(SHGetPathFromIDListA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	jboolean rc = 0;
@@ -11601,7 +12433,7 @@ fail:
 
 #ifndef NO_SHGetPathFromIDListW
 JNIEXPORT jboolean JNICALL OS_NATIVE(SHGetPathFromIDListW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1)
 {
 	jchar *lparg1=NULL;
 	jboolean rc = 0;
@@ -11617,7 +12449,7 @@ fail:
 
 #ifndef NO_SHHandleWMSettingChange
 JNIEXPORT jboolean JNICALL OS_NATIVE(SHHandleWMSettingChange)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
 {
 	SHACTIVATEINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -11673,7 +12505,7 @@ fail:
 
 #ifndef NO_SHSendBackToFocusWindow
 JNIEXPORT void JNICALL OS_NATIVE(SHSendBackToFocusWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, SHSendBackToFocusWindow_FUNC);
 	SHSendBackToFocusWindow(arg0, arg1, arg2);
@@ -11683,7 +12515,7 @@ JNIEXPORT void JNICALL OS_NATIVE(SHSendBackToFocusWindow)
 
 #ifndef NO_SHSetAppKeyWndAssoc
 JNIEXPORT jboolean JNICALL OS_NATIVE(SHSetAppKeyWndAssoc)
-	(JNIEnv *env, jclass that, jbyte arg0, jint arg1)
+	(JNIEnv *env, jclass that, jbyte arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SHSetAppKeyWndAssoc_FUNC);
@@ -11695,7 +12527,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SHSetAppKeyWndAssoc)
 
 #ifndef NO_SHSipPreference
 JNIEXPORT jboolean JNICALL OS_NATIVE(SHSipPreference)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SHSipPreference_FUNC);
@@ -11755,7 +12587,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SYSTEMTIME_1sizeof)
 
 #ifndef NO_SaveDC
 JNIEXPORT jint JNICALL OS_NATIVE(SaveDC)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SaveDC_FUNC);
@@ -11767,7 +12599,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SaveDC)
 
 #ifndef NO_ScreenToClient
 JNIEXPORT jboolean JNICALL OS_NATIVE(ScreenToClient)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	POINT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -11805,7 +12637,7 @@ fail:
 
 #ifndef NO_ScriptBreak
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptBreak)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jobject arg2, jint arg3)
+	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jobject arg2, jintLong arg3)
 {
 	jchar *lparg0=NULL;
 	SCRIPT_ANALYSIS _arg2, *lparg2=NULL;
@@ -11824,7 +12656,7 @@ fail:
 
 #ifndef NO_ScriptCPtoX
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptCPtoX)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jobject arg7, jintArray arg8)
+	(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6, jobject arg7, jintArray arg8)
 {
 	SCRIPT_ANALYSIS _arg7, *lparg7=NULL;
 	jint *lparg8=NULL;
@@ -11843,7 +12675,7 @@ fail:
 
 #ifndef NO_ScriptCacheGetHeight
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptCacheGetHeight)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
@@ -11859,7 +12691,7 @@ fail:
 
 #ifndef NO_ScriptFreeCache
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptFreeCache)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ScriptFreeCache_FUNC);
@@ -11871,7 +12703,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ScriptFreeCache)
 
 #ifndef NO_ScriptGetCMap
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptGetCMap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jshortArray arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jshortArray arg5)
 {
 	jchar *lparg2=NULL;
 	jshort *lparg5=NULL;
@@ -11890,7 +12722,7 @@ fail:
 
 #ifndef NO_ScriptGetFontProperties
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptGetFontProperties)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
 {
 	SCRIPT_FONTPROPERTIES _arg2, *lparg2=NULL;
 	jint rc = 0;
@@ -11906,7 +12738,7 @@ fail:
 
 #ifndef NO_ScriptGetLogicalWidths
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptGetLogicalWidths)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintArray arg6)
 {
 	SCRIPT_ANALYSIS _arg0, *lparg0=NULL;
 	jint *lparg6=NULL;
@@ -11925,18 +12757,18 @@ fail:
 
 #ifndef NO_ScriptGetProperties
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptGetProperties)
-	(JNIEnv *env, jclass that, jintArray arg0, jintArray arg1)
+	(JNIEnv *env, jclass that, jintLongArray arg0, jintArray arg1)
 {
-	jint *lparg0=NULL;
+	jintLong *lparg0=NULL;
 	jint *lparg1=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ScriptGetProperties_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jint)ScriptGetProperties((const SCRIPT_PROPERTIES ***)lparg0, (int *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
+	if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, ScriptGetProperties_FUNC);
 	return rc;
 }
@@ -11944,7 +12776,7 @@ fail:
 
 #ifndef NO_ScriptItemize
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptItemize)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jobject arg3, jobject arg4, jint arg5, jintArray arg6)
+	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2, jobject arg3, jobject arg4, jintLong arg5, jintArray arg6)
 {
 	jchar *lparg0=NULL;
 	SCRIPT_CONTROL _arg3, *lparg3=NULL;
@@ -11969,7 +12801,7 @@ fail:
 
 #ifndef NO_ScriptJustify
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptJustify)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintLong arg5)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ScriptJustify_FUNC);
@@ -12003,7 +12835,7 @@ fail:
 
 #ifndef NO_ScriptPlace
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptPlace)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jint arg7, jintArray arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jintLong arg4, jobject arg5, jintLong arg6, jintLong arg7, jintArray arg8)
 {
 	SCRIPT_ANALYSIS _arg5, *lparg5=NULL;
 	jint *lparg8=NULL;
@@ -12038,7 +12870,7 @@ fail:
 
 #ifndef NO_ScriptShape
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptShape)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jobject arg5, jint arg6, jint arg7, jint arg8, jintArray arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jobject arg5, jintLong arg6, jintLong arg7, jintLong arg8, jintArray arg9)
 {
 	jchar *lparg2=NULL;
 	SCRIPT_ANALYSIS _arg5, *lparg5=NULL;
@@ -12060,7 +12892,7 @@ fail:
 
 #ifndef NO_ScriptStringAnalyse
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptStringAnalyse)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jobject arg7, jobject arg8, jint arg9, jint arg10, jint arg11, jint arg12)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jobject arg7, jobject arg8, jintLong arg9, jintLong arg10, jintLong arg11, jintLong arg12)
 {
 	jchar *lparg1=NULL;
 	SCRIPT_CONTROL _arg7, *lparg7=NULL;
@@ -12082,7 +12914,7 @@ fail:
 
 #ifndef NO_ScriptStringFree
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptStringFree)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ScriptStringFree_FUNC);
@@ -12094,7 +12926,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ScriptStringFree)
 
 #ifndef NO_ScriptStringOut
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptStringOut)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6, jboolean arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jint arg6, jboolean arg7)
 {
 	RECT _arg4, *lparg4=NULL;
 	jint rc = 0;
@@ -12110,7 +12942,7 @@ fail:
 
 #ifndef NO_ScriptTextOut
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptTextOut)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jobject arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jobject arg6, jintLong arg7, jint arg8, jintLong arg9, jint arg10, jintLong arg11, jintLong arg12, jintLong arg13)
 {
 	RECT _arg5, *lparg5=NULL;
 	SCRIPT_ANALYSIS _arg6, *lparg6=NULL;
@@ -12129,7 +12961,7 @@ fail:
 
 #ifndef NO_ScriptXtoCP
 JNIEXPORT jint JNICALL OS_NATIVE(ScriptXtoCP)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jobject arg6, jintArray arg7, jintArray arg8)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5, jobject arg6, jintArray arg7, jintArray arg8)
 {
 	SCRIPT_ANALYSIS _arg6, *lparg6=NULL;
 	jint *lparg7=NULL;
@@ -12151,7 +12983,7 @@ fail:
 
 #ifndef NO_ScrollWindowEx
 JNIEXPORT jint JNICALL OS_NATIVE(ScrollWindowEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jobject arg4, jint arg5, jobject arg6, jint arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3, jobject arg4, jintLong arg5, jobject arg6, jint arg7)
 {
 	RECT _arg3, *lparg3=NULL;
 	RECT _arg4, *lparg4=NULL;
@@ -12173,7 +13005,7 @@ fail:
 
 #ifndef NO_SelectClipRgn
 JNIEXPORT jint JNICALL OS_NATIVE(SelectClipRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SelectClipRgn_FUNC);
@@ -12184,24 +13016,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(SelectClipRgn)
 #endif
 
 #ifndef NO_SelectObject
-JNIEXPORT jint JNICALL OS_NATIVE(SelectObject)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SelectObject)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SelectObject_FUNC);
-	rc = (jint)SelectObject((HDC)arg0, (HGDIOBJ)arg1);
+	rc = (jintLong)SelectObject((HDC)arg0, (HGDIOBJ)arg1);
 	OS_NATIVE_EXIT(env, that, SelectObject_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_SelectPalette
-JNIEXPORT jint JNICALL OS_NATIVE(SelectPalette)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SelectPalette)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SelectPalette_FUNC);
-	rc = (jint)SelectPalette((HDC)arg0, (HPALETTE)arg1, arg2);
+	rc = (jintLong)SelectPalette((HDC)arg0, (HPALETTE)arg1, arg2);
 	OS_NATIVE_EXIT(env, that, SelectPalette_FUNC);
 	return rc;
 }
@@ -12209,7 +13041,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SelectPalette)
 
 #ifndef NO_SendInput
 JNIEXPORT jint JNICALL OS_NATIVE(SendInput)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SendInput_FUNC);
@@ -12219,1032 +13051,1736 @@ JNIEXPORT jint JNICALL OS_NATIVE(SendInput)
 }
 #endif
 
-#ifndef NO_SendMessageA__IIII
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_SendMessageA__IIII) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIII)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIII_FUNC);
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJJ_FUNC);
+#endif
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	BUTTON_IMAGELIST _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getBUTTON_IMAGELISTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setBUTTON_IMAGELISTFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	HDHITTESTINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getHDHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setHDHITTESTINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDITEM_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	HDITEM _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getHDITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setHDITEMFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	HDLAYOUT _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getHDLAYOUTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setHDLAYOUTFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_LITEM_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_LITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	LITEM _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getLITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLITEMFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	LVCOLUMN _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getLVCOLUMNFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLVCOLUMNFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	LVHITTESTINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getLVHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLVHITTESTINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVITEM_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	LVITEM _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getLVITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLVITEMFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_MARGINS_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_MARGINS_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	MARGINS _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getMARGINSFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setMARGINSFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	MCHITTESTINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getMCHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setMCHITTESTINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_POINT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_POINT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	POINT _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_POINT_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getPOINTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setPOINTFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_POINT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	REBARBANDINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getREBARBANDINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setREBARBANDINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	RECT _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getRECTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setRECTFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	SHDRAGIMAGE _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getSHDRAGIMAGEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setSHDRAGIMAGEFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_SIZE_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	SIZE _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getSIZEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setSIZEFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	SYSTEMTIME _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getSYSTEMTIMEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setSYSTEMTIMEFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TBBUTTONINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTBBUTTONINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTBBUTTONINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TBBUTTON _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTBBUTTONFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTBBUTTONFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TCHITTESTINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTCHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTCHITTESTINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCITEM_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TCITEM _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTCITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTCITEMFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TOOLINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTOOLINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTOOLINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TVHITTESTINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTVHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTVHITTESTINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TVINSERTSTRUCT _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTVINSERTSTRUCTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTVINSERTSTRUCTFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVITEM_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TVITEM _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTVITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTVITEMFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TVSORTCB _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTVSORTCBFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTVSORTCBFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	UDACCEL _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getUDACCELFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setUDACCELFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__III_3B
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__III_3B)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
+#if (!defined(NO_SendMessageA__III_3B) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJ_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__III_3B)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jbyteArray arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJ_3B)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jbyteArray arg3)
+#endif
 {
 	jbyte *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__III_3B_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJ_3B_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__III_3B_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJ_3B_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__III_3C
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__III_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3)
+#if (!defined(NO_SendMessageA__III_3C) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJ_3C) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__III_3C)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jcharArray arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJ_3C)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jcharArray arg3)
+#endif
 {
 	jchar *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__III_3C_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJ_3C_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__III_3C_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJ_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__III_3I
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__III_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+#if (!defined(NO_SendMessageA__III_3I) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJ_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__III_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintArray arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJ_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintArray arg3)
+#endif
 {
 	jint *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__III_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJ_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__III_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJ_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__III_3S
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__III_3S)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jshortArray arg3)
+#if (!defined(NO_SendMessageA__III_3S) && !defined(JNI64)) || (!defined(NO_SendMessageA__JIJ_3S) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__III_3S)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jshortArray arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JIJ_3S)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jshortArray arg3)
+#endif
 {
 	jshort *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__III_3S_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JIJ_3S_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetShortArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseShortArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__III_3S_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JIJ_3S_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__II_3II
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__II_3II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3)
+#if (!defined(NO_SendMessageA__II_3II) && !defined(JNI64)) || (!defined(NO_SendMessageA__JI_3JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2, jintLong arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JI_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2, jintLong arg3)
+#endif
 {
-	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong *lparg2=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__II_3II_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)arg3);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JI_3JJ_FUNC);
+#endif
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)arg3);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__II_3II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JI_3JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageA__II_3I_3I
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageA__II_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
+#if (!defined(NO_SendMessageA__II_3I_3I) && !defined(JNI64)) || (!defined(NO_SendMessageA__JI_3I_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__II_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageA__JI_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
+#endif
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageA__II_3I_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageA__JI_3I_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)SendMessageA((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageA((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageA__II_3I_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageA__JI_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIII
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIII)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_SendMessageW__IIII) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIII)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
+#endif
 {
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIII_FUNC);
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJJ_FUNC);
+#endif
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)arg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	BUTTON_IMAGELIST _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getBUTTON_IMAGELISTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setBUTTON_IMAGELISTFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	HDHITTESTINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getHDHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setHDHITTESTINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDITEM_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	HDITEM _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getHDITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setHDITEMFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	HDLAYOUT _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getHDLAYOUTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setHDLAYOUTFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_LITEM_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_LITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	LITEM _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getLITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLITEMFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	LVCOLUMN _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getLVCOLUMNFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLVCOLUMNFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	LVHITTESTINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getLVHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLVHITTESTINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVITEM_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	LVITEM _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getLVITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setLVITEMFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_MARGINS_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_MARGINS_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	MARGINS _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getMARGINSFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setMARGINSFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	MCHITTESTINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getMCHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setMCHITTESTINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_POINT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_POINT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	POINT _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_POINT_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getPOINTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setPOINTFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_POINT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	REBARBANDINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getREBARBANDINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setREBARBANDINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_RECT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_RECT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	RECT _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getRECTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setRECTFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	SHDRAGIMAGE _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getSHDRAGIMAGEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setSHDRAGIMAGEFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_SIZE_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_SIZE_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	SIZE _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getSIZEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setSIZEFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	SYSTEMTIME _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getSYSTEMTIMEFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setSYSTEMTIMEFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TBBUTTONINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTBBUTTONINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTBBUTTONINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TBBUTTON _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTBBUTTONFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTBBUTTONFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TCHITTESTINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTCHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTCHITTESTINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCITEM_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TCITEM _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTCITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTCITEMFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TOOLINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTOOLINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTOOLINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TVHITTESTINFO _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTVHITTESTINFOFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTVHITTESTINFOFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TVINSERTSTRUCT _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTVINSERTSTRUCTFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTVINSERTSTRUCTFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVITEM_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVITEM_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TVITEM _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTVITEMFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTVITEMFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	TVSORTCB _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getTVSORTCBFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setTVSORTCBFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO_SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jobject arg3)
+#endif
 {
 	UDACCEL _arg3, *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
+#endif
 	if (arg3) if ((lparg3 = getUDACCELFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) setUDACCELFields(env, arg3, lparg3);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__III_3C
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__III_3C)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3)
+#if (!defined(NO_SendMessageW__III_3C) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJ_3C) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__III_3C)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jcharArray arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJ_3C)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jcharArray arg3)
+#endif
 {
 	jchar *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__III_3C_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJ_3C_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetCharArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseCharArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__III_3C_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJ_3C_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__III_3I
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__III_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+#if (!defined(NO_SendMessageW__III_3I) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJ_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__III_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintArray arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJ_3I)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintArray arg3)
+#endif
 {
 	jint *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__III_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJ_3I_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__III_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJ_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__III_3S
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__III_3S)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jshortArray arg3)
+#if (!defined(NO_SendMessageW__III_3S) && !defined(JNI64)) || (!defined(NO_SendMessageW__JIJ_3S) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__III_3S)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jshortArray arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JIJ_3S)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jshortArray arg3)
+#endif
 {
 	jshort *lparg3=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__III_3S_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JIJ_3S_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetShortArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)arg2, (LPARAM)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseShortArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__III_3S_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JIJ_3S_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_SendMessageW__II_3II
-JNIEXPORT jint JNICALL OS_NATIVE(SendMessageW__II_3II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3)
+#if (!defined(NO_SendMessageW__II_3II) && !defined(JNI64)) || (!defined(NO_SendMessageW__JI_3JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2, jintLong arg3)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JI_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2, jintLong arg3)
+#endif
 {
-	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong *lparg2=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__II_3II_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)arg3);
+#else
+	OS_NATIVE_ENTER(env, that, SendMessageW__JI_3JJ_FUNC);
+#endif
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)arg3);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__II_3II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, SendMessageW__JI_3JJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_SetActiveWindow
-JNIEXPORT jint JNICALL OS_NATIVE(SetActiveWindow)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetActiveWindow)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SetActiveWindow_FUNC);
-	rc = (jint)SetActiveWindow((HWND)arg0);
+	rc = (jintLong)SetActiveWindow((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, SetActiveWindow_FUNC);
 	return rc;
 }
@@ -13252,7 +14788,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetActiveWindow)
 
 #ifndef NO_SetBkColor
 JNIEXPORT jint JNICALL OS_NATIVE(SetBkColor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetBkColor_FUNC);
@@ -13264,7 +14800,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetBkColor)
 
 #ifndef NO_SetBkMode
 JNIEXPORT jint JNICALL OS_NATIVE(SetBkMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetBkMode_FUNC);
@@ -13276,7 +14812,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetBkMode)
 
 #ifndef NO_SetBrushOrgEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetBrushOrgEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3)
 {
 	POINT _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -13291,12 +14827,12 @@ fail:
 #endif
 
 #ifndef NO_SetCapture
-JNIEXPORT jint JNICALL OS_NATIVE(SetCapture)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetCapture)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SetCapture_FUNC);
-	rc = (jint)SetCapture((HWND)arg0);
+	rc = (jintLong)SetCapture((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, SetCapture_FUNC);
 	return rc;
 }
@@ -13315,24 +14851,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetCaretPos)
 #endif
 
 #ifndef NO_SetClipboardData
-JNIEXPORT jint JNICALL OS_NATIVE(SetClipboardData)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetClipboardData)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SetClipboardData_FUNC);
-	rc = (jint)SetClipboardData(arg0, (HANDLE)arg1);
+	rc = (jintLong)SetClipboardData(arg0, (HANDLE)arg1);
 	OS_NATIVE_EXIT(env, that, SetClipboardData_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_SetCursor
-JNIEXPORT jint JNICALL OS_NATIVE(SetCursor)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetCursor)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SetCursor_FUNC);
-	rc = (jint)SetCursor((HCURSOR)arg0);
+	rc = (jintLong)SetCursor((HCURSOR)arg0);
 	OS_NATIVE_EXIT(env, that, SetCursor_FUNC);
 	return rc;
 }
@@ -13352,7 +14888,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetCursorPos)
 
 #ifndef NO_SetDIBColorTable
 JNIEXPORT jint JNICALL OS_NATIVE(SetDIBColorTable)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jbyteArray arg3)
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
@@ -13393,12 +14929,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetErrorMode)
 #endif
 
 #ifndef NO_SetFocus
-JNIEXPORT jint JNICALL OS_NATIVE(SetFocus)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetFocus)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SetFocus_FUNC);
-	rc = (jint)SetFocus((HWND)arg0);
+	rc = (jintLong)SetFocus((HWND)arg0);
 	OS_NATIVE_EXIT(env, that, SetFocus_FUNC);
 	return rc;
 }
@@ -13406,7 +14942,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetFocus)
 
 #ifndef NO_SetForegroundWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetForegroundWindow)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SetForegroundWindow_FUNC);
@@ -13418,7 +14954,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetForegroundWindow)
 
 #ifndef NO_SetGraphicsMode
 JNIEXPORT jint JNICALL OS_NATIVE(SetGraphicsMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetGraphicsMode_FUNC);
@@ -13430,7 +14966,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetGraphicsMode)
 
 #ifndef NO_SetLayeredWindowAttributes
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetLayeredWindowAttributes)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyte arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyte arg2, jint arg3)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SetLayeredWindowAttributes_FUNC);
@@ -13438,17 +14974,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetLayeredWindowAttributes)
 	rc = (jboolean)SetLayeredWindowAttributes((HWND)arg0, arg1, arg2, arg3);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(SetLayeredWindowAttributes_LIB);
-			if (hm) fp = GetProcAddress(hm, "SetLayeredWindowAttributes");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, SetLayeredWindowAttributes)
 		if (fp) {
-			rc = (jboolean)fp((HWND)arg0, arg1, arg2, arg3);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, jint, jbyte, jint))fp)((HWND)arg0, arg1, arg2, arg3);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, SetLayeredWindowAttributes_FUNC);
@@ -13458,7 +14986,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetLayeredWindowAttributes)
 
 #ifndef NO_SetLayout
 JNIEXPORT jint JNICALL OS_NATIVE(SetLayout)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetLayout_FUNC);
@@ -13466,17 +14994,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetLayout)
 	rc = (jint)SetLayout((HDC)arg0, (DWORD)arg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(SetLayout_LIB);
-			if (hm) fp = GetProcAddress(hm, "SetLayout");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, SetLayout)
 		if (fp) {
-			rc = (jint)fp((HDC)arg0, (DWORD)arg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HDC, DWORD))fp)((HDC)arg0, (DWORD)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, SetLayout_FUNC);
@@ -13486,7 +15006,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetLayout)
 
 #ifndef NO_SetMapMode
 JNIEXPORT jint JNICALL OS_NATIVE(SetMapMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetMapMode_FUNC);
@@ -13498,7 +15018,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetMapMode)
 
 #ifndef NO_SetMapperFlags
 JNIEXPORT jint JNICALL OS_NATIVE(SetMapperFlags)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetMapperFlags_FUNC);
@@ -13510,7 +15030,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetMapperFlags)
 
 #ifndef NO_SetMenu
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenu)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SetMenu_FUNC);
@@ -13522,7 +15042,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenu)
 
 #ifndef NO_SetMenuDefaultItem
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuDefaultItem)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SetMenuDefaultItem_FUNC);
@@ -13534,7 +15054,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuDefaultItem)
 
 #ifndef NO_SetMenuInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuInfo)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	MENUINFO _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -13544,17 +15064,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuInfo)
 	rc = (jboolean)SetMenuInfo((HMENU)arg0, lparg1);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(SetMenuInfo_LIB);
-			if (hm) fp = GetProcAddress(hm, "SetMenuInfo");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, SetMenuInfo)
 		if (fp) {
-			rc = (jboolean)fp((HMENU)arg0, lparg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HMENU, MENUINFO *))fp)((HMENU)arg0, lparg1);
 		}
 	}
 fail:
@@ -13566,7 +15078,7 @@ fail:
 
 #ifndef NO_SetMenuItemInfoA
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuItemInfoA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -13582,7 +15094,7 @@ fail:
 
 #ifndef NO_SetMenuItemInfoW
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetMenuItemInfoW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jobject arg3)
 {
 	MENUITEMINFO _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -13598,7 +15110,7 @@ fail:
 
 #ifndef NO_SetMetaRgn
 JNIEXPORT jint JNICALL OS_NATIVE(SetMetaRgn)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetMetaRgn_FUNC);
@@ -13610,7 +15122,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetMetaRgn)
 
 #ifndef NO_SetPaletteEntries
 JNIEXPORT jint JNICALL OS_NATIVE(SetPaletteEntries)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jbyteArray arg3)
 {
 	jbyte *lparg3=NULL;
 	jint rc = 0;
@@ -13639,12 +15151,12 @@ fail:
 #endif
 
 #ifndef NO_SetParent
-JNIEXPORT jint JNICALL OS_NATIVE(SetParent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetParent)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SetParent_FUNC);
-	rc = (jint)SetParent((HWND)arg0, (HWND)arg1);
+	rc = (jintLong)SetParent((HWND)arg0, (HWND)arg1);
 	OS_NATIVE_EXIT(env, that, SetParent_FUNC);
 	return rc;
 }
@@ -13652,7 +15164,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetParent)
 
 #ifndef NO_SetPixel
 JNIEXPORT jint JNICALL OS_NATIVE(SetPixel)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetPixel_FUNC);
@@ -13664,7 +15176,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetPixel)
 
 #ifndef NO_SetPolyFillMode
 JNIEXPORT jint JNICALL OS_NATIVE(SetPolyFillMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetPolyFillMode_FUNC);
@@ -13684,17 +15196,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetProcessDPIAware)
 	rc = (jboolean)SetProcessDPIAware();
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(SetProcessDPIAware_LIB);
-			if (hm) fp = GetProcAddress(hm, "SetProcessDPIAware");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, SetProcessDPIAware)
 		if (fp) {
-			rc = (jboolean)fp();
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, SetProcessDPIAware_FUNC);
@@ -13704,7 +15208,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetProcessDPIAware)
 
 #ifndef NO_SetPropA
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetPropA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SetPropA_FUNC);
@@ -13716,7 +15220,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetPropA)
 
 #ifndef NO_SetPropW
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetPropW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SetPropW_FUNC);
@@ -13728,7 +15232,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetPropW)
 
 #ifndef NO_SetROP2
 JNIEXPORT jint JNICALL OS_NATIVE(SetROP2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetROP2_FUNC);
@@ -13756,7 +15260,7 @@ fail:
 
 #ifndef NO_SetRectRgn
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetRectRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SetRectRgn_FUNC);
@@ -13768,7 +15272,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetRectRgn)
 
 #ifndef NO_SetScrollInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetScrollInfo)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jboolean arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2, jboolean arg3)
 {
 	SCROLLINFO _arg2, *lparg2=NULL;
 	jboolean rc = 0;
@@ -13784,7 +15288,7 @@ fail:
 
 #ifndef NO_SetStretchBltMode
 JNIEXPORT jint JNICALL OS_NATIVE(SetStretchBltMode)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetStretchBltMode_FUNC);
@@ -13796,7 +15300,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetStretchBltMode)
 
 #ifndef NO_SetTextAlign
 JNIEXPORT jint JNICALL OS_NATIVE(SetTextAlign)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetTextAlign_FUNC);
@@ -13808,7 +15312,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetTextAlign)
 
 #ifndef NO_SetTextColor
 JNIEXPORT jint JNICALL OS_NATIVE(SetTextColor)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetTextColor_FUNC);
@@ -13819,12 +15323,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetTextColor)
 #endif
 
 #ifndef NO_SetTimer
-JNIEXPORT jint JNICALL OS_NATIVE(SetTimer)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetTimer)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SetTimer_FUNC);
-	rc = (jint)SetTimer((HWND)arg0, arg1, arg2, (TIMERPROC)arg3);
+	rc = (jintLong)SetTimer((HWND)arg0, arg1, arg2, (TIMERPROC)arg3);
 	OS_NATIVE_EXIT(env, that, SetTimer_FUNC);
 	return rc;
 }
@@ -13832,7 +15336,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetTimer)
 
 #ifndef NO_SetViewportExtEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetViewportExtEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3)
 {
 	SIZE _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -13848,7 +15352,7 @@ fail:
 
 #ifndef NO_SetViewportOrgEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetViewportOrgEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3)
 {
 	POINT _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -13864,7 +15368,7 @@ fail:
 
 #ifndef NO_SetWindowExtEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowExtEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3)
 {
 	SIZE _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -13880,7 +15384,7 @@ fail:
 
 #ifndef NO_SetWindowLongA
 JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLongA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetWindowLongA_FUNC);
@@ -13891,24 +15395,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLongA)
 #endif
 
 #ifndef NO_SetWindowLongPtrA
-JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLongPtrA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowLongPtrA)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SetWindowLongPtrA_FUNC);
-	rc = (jint)SetWindowLongPtrA((HWND)arg0, arg1, (LONG_PTR)arg2);
+	rc = (jintLong)SetWindowLongPtrA((HWND)arg0, arg1, (LONG_PTR)arg2);
 	OS_NATIVE_EXIT(env, that, SetWindowLongPtrA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_SetWindowLongPtrW
-JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLongPtrW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowLongPtrW)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SetWindowLongPtrW_FUNC);
-	rc = (jint)SetWindowLongPtrW((HWND)arg0, arg1, (LONG_PTR)arg2);
+	rc = (jintLong)SetWindowLongPtrW((HWND)arg0, arg1, (LONG_PTR)arg2);
 	OS_NATIVE_EXIT(env, that, SetWindowLongPtrW_FUNC);
 	return rc;
 }
@@ -13916,7 +15420,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLongPtrW)
 
 #ifndef NO_SetWindowLongW
 JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLongW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetWindowLongW_FUNC);
@@ -13928,7 +15432,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowLongW)
 
 #ifndef NO_SetWindowOrgEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowOrgEx)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3)
 {
 	POINT _arg3, *lparg3=NULL;
 	jboolean rc = 0;
@@ -13944,7 +15448,7 @@ fail:
 
 #ifndef NO_SetWindowPlacement
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowPlacement)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	WINDOWPLACEMENT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -13960,7 +15464,7 @@ fail:
 
 #ifndef NO_SetWindowPos
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowPos)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, SetWindowPos_FUNC);
@@ -13972,7 +15476,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowPos)
 
 #ifndef NO_SetWindowRgn
 JNIEXPORT jint JNICALL OS_NATIVE(SetWindowRgn)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SetWindowRgn_FUNC);
@@ -13984,7 +15488,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowRgn)
 
 #ifndef NO_SetWindowTextA
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowTextA)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	jboolean rc = 0;
@@ -14000,7 +15504,7 @@ fail:
 
 #ifndef NO_SetWindowTextW
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetWindowTextW)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1)
 {
 	jchar *lparg1=NULL;
 	jboolean rc = 0;
@@ -14016,7 +15520,7 @@ fail:
 
 #ifndef NO_SetWindowTheme
 JNIEXPORT jint JNICALL OS_NATIVE(SetWindowTheme)
-	(JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jcharArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jcharArray arg2)
 {
 	jchar *lparg1=NULL;
 	jchar *lparg2=NULL;
@@ -14028,17 +15532,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowTheme)
 	rc = (jint)SetWindowTheme((HWND)arg0, (LPCWSTR)lparg1, (LPCWSTR)lparg2);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(SetWindowTheme_LIB);
-			if (hm) fp = GetProcAddress(hm, "SetWindowTheme");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, SetWindowTheme)
 		if (fp) {
-			rc = (jint)fp((HWND)arg0, (LPCWSTR)lparg1, (LPCWSTR)lparg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(HWND, LPCWSTR, LPCWSTR))fp)((HWND)arg0, (LPCWSTR)lparg1, (LPCWSTR)lparg2);
 		}
 	}
 fail:
@@ -14050,24 +15546,24 @@ fail:
 #endif
 
 #ifndef NO_SetWindowsHookExA
-JNIEXPORT jint JNICALL OS_NATIVE(SetWindowsHookExA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowsHookExA)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SetWindowsHookExA_FUNC);
-	rc = (jint)SetWindowsHookExA(arg0, (HOOKPROC)arg1, (HINSTANCE)arg2, arg3);
+	rc = (jintLong)SetWindowsHookExA(arg0, (HOOKPROC)arg1, (HINSTANCE)arg2, arg3);
 	OS_NATIVE_EXIT(env, that, SetWindowsHookExA_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_SetWindowsHookExW
-JNIEXPORT jint JNICALL OS_NATIVE(SetWindowsHookExW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SetWindowsHookExW)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, SetWindowsHookExW_FUNC);
-	rc = (jint)SetWindowsHookExW(arg0, (HOOKPROC)arg1, (HINSTANCE)arg2, arg3);
+	rc = (jintLong)SetWindowsHookExW(arg0, (HOOKPROC)arg1, (HINSTANCE)arg2, arg3);
 	OS_NATIVE_EXIT(env, that, SetWindowsHookExW_FUNC);
 	return rc;
 }
@@ -14075,7 +15571,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetWindowsHookExW)
 
 #ifndef NO_SetWorldTransform
 JNIEXPORT jboolean JNICALL OS_NATIVE(SetWorldTransform)
-	(JNIEnv *env, jclass that, jint arg0, jfloatArray arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jfloatArray arg1)
 {
 	jfloat *lparg1=NULL;
 	jboolean rc = 0;
@@ -14155,7 +15651,7 @@ fail:
 
 #ifndef NO_ShowCaret
 JNIEXPORT jboolean JNICALL OS_NATIVE(ShowCaret)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ShowCaret_FUNC);
@@ -14179,7 +15675,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ShowCursor)
 
 #ifndef NO_ShowOwnedPopups
 JNIEXPORT jboolean JNICALL OS_NATIVE(ShowOwnedPopups)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ShowOwnedPopups_FUNC);
@@ -14191,7 +15687,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ShowOwnedPopups)
 
 #ifndef NO_ShowScrollBar
 JNIEXPORT jboolean JNICALL OS_NATIVE(ShowScrollBar)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ShowScrollBar_FUNC);
@@ -14203,7 +15699,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(ShowScrollBar)
 
 #ifndef NO_ShowWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(ShowWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, ShowWindow_FUNC);
@@ -14231,7 +15727,7 @@ fail:
 
 #ifndef NO_StartDocA
 JNIEXPORT jint JNICALL OS_NATIVE(StartDocA)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	DOCINFO _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -14247,7 +15743,7 @@ fail:
 
 #ifndef NO_StartDocW
 JNIEXPORT jint JNICALL OS_NATIVE(StartDocW)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	DOCINFO _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -14263,7 +15759,7 @@ fail:
 
 #ifndef NO_StartPage
 JNIEXPORT jint JNICALL OS_NATIVE(StartPage)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, StartPage_FUNC);
@@ -14275,7 +15771,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(StartPage)
 
 #ifndef NO_StretchBlt
 JNIEXPORT jboolean JNICALL OS_NATIVE(StretchBlt)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, StretchBlt_FUNC);
@@ -14287,7 +15783,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(StretchBlt)
 
 #ifndef NO_StrokePath
 JNIEXPORT jboolean JNICALL OS_NATIVE(StrokePath)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, StrokePath_FUNC);
@@ -14673,7 +16169,7 @@ fail:
 
 #ifndef NO_TrackPopupMenu
 JNIEXPORT jboolean JNICALL OS_NATIVE(TrackPopupMenu)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jobject arg6)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jobject arg6)
 {
 	RECT _arg6, *lparg6=NULL;
 	jboolean rc = 0;
@@ -14689,7 +16185,7 @@ fail:
 
 #ifndef NO_TranslateAcceleratorA
 JNIEXPORT jint JNICALL OS_NATIVE(TranslateAcceleratorA)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
 {
 	MSG _arg2, *lparg2=NULL;
 	jint rc = 0;
@@ -14705,7 +16201,7 @@ fail:
 
 #ifndef NO_TranslateAcceleratorW
 JNIEXPORT jint JNICALL OS_NATIVE(TranslateAcceleratorW)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
 {
 	MSG _arg2, *lparg2=NULL;
 	jint rc = 0;
@@ -14721,7 +16217,7 @@ fail:
 
 #ifndef NO_TranslateCharsetInfo
 JNIEXPORT jboolean JNICALL OS_NATIVE(TranslateCharsetInfo)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2)
 {
 	jint *lparg1=NULL;
 	jboolean rc = 0;
@@ -14737,7 +16233,7 @@ fail:
 
 #ifndef NO_TranslateMDISysAccel
 JNIEXPORT jboolean JNICALL OS_NATIVE(TranslateMDISysAccel)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	MSG _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -14769,7 +16265,7 @@ fail:
 
 #ifndef NO_TransparentBlt
 JNIEXPORT jboolean JNICALL OS_NATIVE(TransparentBlt)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, TransparentBlt_FUNC);
@@ -14777,17 +16273,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(TransparentBlt)
 	rc = (jboolean)TransparentBlt(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(TransparentBlt_LIB);
-			if (hm) fp = GetProcAddress(hm, "TransparentBlt");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, TransparentBlt)
 		if (fp) {
-			rc = (jboolean)fp(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint, jint, jint, jint, jintLong, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, TransparentBlt_FUNC);
@@ -14797,7 +16285,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(TransparentBlt)
 
 #ifndef NO_TransparentImage
 JNIEXPORT jboolean JNICALL OS_NATIVE(TransparentImage)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, TransparentImage_FUNC);
@@ -14809,7 +16297,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(TransparentImage)
 
 #ifndef NO_TreeView_1GetItemRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(TreeView_1GetItemRect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jboolean arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jboolean arg3)
 {
 	RECT _arg2, *lparg2=NULL;
 	jboolean rc = 0;
@@ -14837,7 +16325,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(UDACCEL_1sizeof)
 
 #ifndef NO_UnhookWindowsHookEx
 JNIEXPORT jboolean JNICALL OS_NATIVE(UnhookWindowsHookEx)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, UnhookWindowsHookEx_FUNC);
@@ -14849,7 +16337,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UnhookWindowsHookEx)
 
 #ifndef NO_UnregisterClassA
 JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterClassA)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
 {
 	jbyte *lparg0=NULL;
 	jboolean rc = 0;
@@ -14865,7 +16353,7 @@ fail:
 
 #ifndef NO_UnregisterClassW
 JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterClassW)
-	(JNIEnv *env, jclass that, jcharArray arg0, jint arg1)
+	(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1)
 {
 	jchar *lparg0=NULL;
 	jboolean rc = 0;
@@ -14881,7 +16369,7 @@ fail:
 
 #ifndef NO_UpdateLayeredWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(UpdateLayeredWindow)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jint arg4, jobject arg5, jint arg6, jobject arg7, jint arg8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4, jobject arg5, jint arg6, jobject arg7, jint arg8)
 {
 	POINT _arg2, *lparg2=NULL;
 	SIZE _arg3, *lparg3=NULL;
@@ -14897,17 +16385,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UpdateLayeredWindow)
 	rc = (jboolean)UpdateLayeredWindow((HWND)arg0, (HDC)arg1, lparg2, lparg3, (HDC)arg4, lparg5, (COLORREF)arg6, lparg7, arg8);
 */
 	{
-		static int initialized = 0;
-		static HMODULE hm = NULL;
-		static FARPROC fp = NULL;
-		rc = 0;
-		if (!initialized) {
-			if (!hm) hm = LoadLibrary(UpdateLayeredWindow_LIB);
-			if (hm) fp = GetProcAddress(hm, "UpdateLayeredWindow");
-			initialized = 1;
-		}
+		LOAD_FUNCTION(fp, UpdateLayeredWindow)
 		if (fp) {
-			rc = (jboolean)fp((HWND)arg0, (HDC)arg1, lparg2, lparg3, (HDC)arg4, lparg5, (COLORREF)arg6, lparg7, arg8);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND, HDC, POINT *, SIZE *, HDC, POINT *, COLORREF, BLENDFUNCTION *, jint))fp)((HWND)arg0, (HDC)arg1, lparg2, lparg3, (HDC)arg4, lparg5, (COLORREF)arg6, lparg7, arg8);
 		}
 	}
 fail:
@@ -14922,7 +16402,7 @@ fail:
 
 #ifndef NO_UpdateWindow
 JNIEXPORT jboolean JNICALL OS_NATIVE(UpdateWindow)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, UpdateWindow_FUNC);
@@ -14934,7 +16414,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UpdateWindow)
 
 #ifndef NO_ValidateRect
 JNIEXPORT jboolean JNICALL OS_NATIVE(ValidateRect)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	RECT _arg1, *lparg1=NULL;
 	jboolean rc = 0;
@@ -14972,232 +16452,386 @@ JNIEXPORT jshort JNICALL OS_NATIVE(VkKeyScanW)
 }
 #endif
 
-#ifndef NO_VtblCall__II
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO_VtblCall__II) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__II_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint))(*(jint **)arg1)[arg0])(arg1);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong))(*(jintLong **)arg1)[arg0])(arg1);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__III)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO_VtblCall__III) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__III_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJI_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__III_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJI_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIII_3I
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIIII_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+#if (!defined(NO_VtblCall__IIIII_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIII_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+#endif
 {
 	jint *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__IIIII_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJIII_3I_FUNC);
+#endif
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__IIIII_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJIII_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIIJI_3J
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIIJI_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5)
+#if (!defined(NO_VtblCall__IIIJI_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJIJI_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5)
+#endif
 {
 	jlong *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__IIIJI_3J_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJIJI_3J_FUNC);
+#endif
 	if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jlong, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__IIIJI_3J_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJIJI_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__III_3I_3I
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__III_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
+#if (!defined(NO_VtblCall__III_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJI_3J_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__III_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintArray arg4)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintArray arg4)
+#endif
 {
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__III_3I_3I_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJI_3J_3I_FUNC);
+#endif
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jintLong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__III_3I_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJI_3J_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJ
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJ)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2)
+#if (!defined(NO_VtblCall__IIJ) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2)
+#endif
 {
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__IIJ_FUNC);
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong))(*(jint **)arg1)[arg0])(arg1, arg2);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJJ_FUNC);
+#endif
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__IIJ_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJJ_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJII_3J
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJII_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlongArray arg5)
+#if (!defined(NO_VtblCall__IIJII_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJII_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlongArray arg5)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlongArray arg5)
+#endif
 {
 	jlong *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__IIJII_3J_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJJII_3J_FUNC);
+#endif
 	if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__IIJII_3J_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJJII_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIJJI_3J
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJJI_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5)
+#if (!defined(NO_VtblCall__IIJJI_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJJJI_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIJJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJJJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5)
+#endif
 {
 	jlong *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__IIJJI_3J_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJJJI_3J_FUNC);
+#endif
 	if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__IIJJI_3J_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJJJI_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+#if (!defined(NO_VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2) && !defined(JNI64)) || (!defined(NO_VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2)
+#endif
 {
 	TF_DISPLAYATTRIBUTE _arg2, *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC);
+#endif
 	if (arg2) if ((lparg2 = getTF_DISPLAYATTRIBUTEFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, TF_DISPLAYATTRIBUTE *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, TF_DISPLAYATTRIBUTE *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setTF_DISPLAYATTRIBUTEFields(env, arg2, lparg2);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__IIS_3B_3B_3B
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIS_3B_3B_3B)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jshort arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5)
+#if (!defined(NO_VtblCall__IIS_3B_3B_3B) && !defined(JNI64)) || (!defined(NO_VtblCall__IJS_3B_3B_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IIS_3B_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJS_3B_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5)
+#endif
 {
 	jbyte *lparg3=NULL;
 	jbyte *lparg4=NULL;
 	jbyte *lparg5=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__IIS_3B_3B_3B_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJS_3B_3B_3B_FUNC);
+#endif
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jshort, jbyte *, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort, jbyte *, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__IIS_3B_3B_3B_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJS_3B_3B_3B_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3B_3I
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3B_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3)
+#if (!defined(NO_VtblCall__II_3B_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3B_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintLongArray arg3)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintLongArray arg3)
+#endif
 {
 	jbyte *lparg2=NULL;
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jintLong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3CII_3I_3I
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3CII_3I_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
+#if (!defined(NO_VtblCall__II_3CII_3I_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3CII_3I_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3CII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3CII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
+#endif
 {
 	jchar *lparg2=NULL;
 	jint *lparg5=NULL;
 	jint *lparg6=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__II_3CII_3I_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJ_3CII_3I_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__II_3CII_3I_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJ_3CII_3I_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3I
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3I)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+#if (!defined(NO_VtblCall__II_3I) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2)
+#endif
 {
 	jint *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__II_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJ_3I_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__II_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJ_3I_FUNC);
+#endif
 	return rc;
 }
 #endif
 
-#ifndef NO_VtblCall__II_3J
-JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3J)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2)
+#if (!defined(NO_VtblCall__II_3J) && !defined(JNI64)) || (!defined(NO_VtblCall__IJ_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(VtblCall__IJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2)
+#endif
 {
 	jlong *lparg2=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, VtblCall__II_3J_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, VtblCall__IJ_3J_FUNC);
+#endif
 	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+	rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, VtblCall__II_3J_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, VtblCall__IJ_3J_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -15250,15 +16884,22 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(WaitMessage)
 }
 #endif
 
-#ifndef NO_WideCharToMultiByte__II_3CIII_3B_3Z
-JNIEXPORT jint JNICALL OS_NATIVE(WideCharToMultiByte__II_3CIII_3B_3Z)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jbyteArray arg6, jbooleanArray arg7)
+#if (!defined(NO_WideCharToMultiByte__II_3CIII_3B_3Z) && !defined(JNI64)) || (!defined(NO_WideCharToMultiByte__II_3CIJI_3B_3Z) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(WideCharToMultiByte__II_3CIII_3B_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintLong arg4, jint arg5, jbyteArray arg6, jbooleanArray arg7)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(WideCharToMultiByte__II_3CIJI_3B_3Z)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintLong arg4, jint arg5, jbyteArray arg6, jbooleanArray arg7)
+#endif
 {
 	jchar *lparg2=NULL;
 	jbyte *lparg6=NULL;
 	jboolean *lparg7=NULL;
 	jint rc = 0;
+#ifndef JNI64
 	OS_NATIVE_ENTER(env, that, WideCharToMultiByte__II_3CIII_3B_3Z_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, WideCharToMultiByte__II_3CIJI_3B_3Z_FUNC);
+#endif
 	if (arg6) if ((lparg6 = (*env)->GetByteArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = (*env)->GetBooleanArrayElements(env, arg7, NULL)) == NULL) goto fail;
 #ifdef JNI_VERSION_1_2
@@ -15281,7 +16922,11 @@ fail:
 	}
 	if (arg7 && lparg7) (*env)->ReleaseBooleanArrayElements(env, arg7, lparg7, 0);
 	if (arg6 && lparg6) (*env)->ReleaseByteArrayElements(env, arg6, lparg6, 0);
+#ifndef JNI64
 	OS_NATIVE_EXIT(env, that, WideCharToMultiByte__II_3CIII_3B_3Z_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, WideCharToMultiByte__II_3CIJI_3B_3Z_FUNC);
+#endif
 	return rc;
 }
 #endif
@@ -15328,26 +16973,26 @@ fail:
 #endif
 
 #ifndef NO_WindowFromDC
-JNIEXPORT jint JNICALL OS_NATIVE(WindowFromDC)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(WindowFromDC)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, WindowFromDC_FUNC);
-	rc = (jint)WindowFromDC((HDC)arg0);
+	rc = (jintLong)WindowFromDC((HDC)arg0);
 	OS_NATIVE_EXIT(env, that, WindowFromDC_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_WindowFromPoint
-JNIEXPORT jint JNICALL OS_NATIVE(WindowFromPoint)
+JNIEXPORT jintLong JNICALL OS_NATIVE(WindowFromPoint)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
 	POINT _arg0, *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, WindowFromPoint_FUNC);
 	if (arg0) if ((lparg0 = getPOINTFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)WindowFromPoint(*lparg0);
+	rc = (jintLong)WindowFromPoint(*lparg0);
 fail:
 	if (arg0 && lparg0) setPOINTFields(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, WindowFromPoint_FUNC);
@@ -15357,7 +17002,7 @@ fail:
 
 #ifndef NO_wcslen
 JNIEXPORT jint JNICALL OS_NATIVE(wcslen)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, wcslen_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
index 6de1a5e858..2db44ddf27 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
@@ -35,12 +35,12 @@ BOOL WINAPI DllMain(HANDLE hInstDLL, DWORD dwReason, LPVOID lpvReserved)
 }
 
 #ifndef NO_GetLibraryHandle
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(GetLibraryHandle)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GetLibraryHandle)
 	(JNIEnv *env, jclass that)
 {
-	SWT_PTR rc;
+	jintLong rc;
 	OS_NATIVE_ENTER(env, that, GetLibraryHandle_FUNC)
-	rc = (SWT_PTR)g_hInstance;
+	rc = (jintLong)g_hInstance;
 	OS_NATIVE_EXIT(env, that, GetLibraryHandle_FUNC)
 	return rc;
 }
@@ -78,18 +78,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(IsSP)
 }
 #endif
 
-#if (!defined(NO_SendMessageW__II_3I_3I) && !defined(SWT_PTR_SIZE_64)) || (!defined(SendMessageW__JI_3I_3I) && defined(SWT_PTR_SIZE_64))
-#ifdef SWT_PTR_SIZE_64
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(SendMessageW__JI_3I_3I)
+#if (!defined(NO_SendMessageW__II_3I_3I) && !defined(JNI64)) || (!defined(SendMessageW__JI_3I_3I) && defined(JNI64))
+#ifdef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__JI_3I_3I)
 #else
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(SendMessageW__II_3I_3I)
+JNIEXPORT jintLong JNICALL OS_NATIVE(SendMessageW__II_3I_3I)
 #endif
-	(JNIEnv *env, jclass that, SWT_PTR arg0, jint arg1, jintArray arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
-	SWT_PTR rc = 0;
-#ifdef SWT_PTR_SIZE_64
+	jintLong rc = 0;
+#ifdef JNI64
 	OS_NATIVE_ENTER(env, that, SendMessageW__JI_3I_3I_FUNC)
 #else
 	OS_NATIVE_ENTER(env, that, SendMessageW__II_3I_3I_FUNC)
@@ -107,24 +107,24 @@ JNIEXPORT SWT_PTR JNICALL OS_NATIVE(SendMessageW__II_3I_3I)
 		case EM_GETSEL:
 		case CB_GETEDITSEL: {
 			jint wParam = 0, lParam = 0;
-			SWT_PTR *lpwParam = NULL, *lplParam = NULL;
+			jintLong *lpwParam = NULL, *lplParam = NULL;
 			if (lparg2 != NULL) lpwParam = &wParam;
 			if (lparg3 != NULL) lplParam = &lParam;
-			rc = (SWT_PTR)SendMessageW((HWND)arg0, arg1, (WPARAM)lpwParam, (LPARAM)lplParam);
+			rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)lpwParam, (LPARAM)lplParam);
 			if (lparg2 != NULL) lparg2[0] = wParam;
 			if (lparg3 != NULL) lparg3[0] = lParam;
 			break;
 		}
 		default:
-			rc = (SWT_PTR)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
+			rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
 	}
 #else
-	rc = (SWT_PTR)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
+	rc = (jintLong)SendMessageW((HWND)arg0, arg1, (WPARAM)lparg2, (LPARAM)lparg3);
 #endif
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-#ifdef SWT_PTR_SIZE_64
+#ifdef JNI64
 	OS_NATIVE_EXIT(env, that, SendMessageW__JI_3I_3I_FUNC)
 #else
 	OS_NATIVE_EXIT(env, that, SendMessageW__II_3I_3I_FUNC)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c
index 0477235383..1f55969fdf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.c
@@ -95,13 +95,29 @@ char * OS_nativeFunctionNames[] = {
 	"CreateCursor",
 	"CreateDCA",
 	"CreateDCW",
+#ifndef JNI64
 	"CreateDIBSection__III_3III",
+#else
+	"CreateDIBSection__JJI_3JJI",
+#endif
+#ifndef JNI64
 	"CreateDIBSection__I_3BI_3III",
+#else
+	"CreateDIBSection__J_3BI_3JJI",
+#endif
 	"CreateEnhMetaFileA",
 	"CreateEnhMetaFileW",
+#ifndef JNI64
 	"CreateFontIndirectA__I",
+#else
+	"CreateFontIndirectA__J",
+#endif
 	"CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2",
+#ifndef JNI64
 	"CreateFontIndirectW__I",
+#else
+	"CreateFontIndirectW__J",
+#endif
 	"CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2",
 	"CreateIconIndirect",
 	"CreateMenu",
@@ -293,20 +309,76 @@ char * OS_nativeFunctionNames[] = {
 	"GetMonitorInfoA",
 	"GetMonitorInfoW",
 	"GetNearestPaletteIndex",
+#ifndef JNI64
 	"GetObjectA__III",
+#else
+	"GetObjectA__JIJ",
+#endif
+#ifndef JNI64
 	"GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2",
+#else
+	"GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2",
+#endif
+#ifndef JNI64
 	"GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2",
+#else
+	"GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2",
+#endif
+#ifndef JNI64
 	"GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2",
+#else
+	"GetObjectA__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2",
+#endif
+#ifndef JNI64
 	"GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2",
+#else
+	"GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2",
+#endif
+#ifndef JNI64
 	"GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2",
+#else
+	"GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2",
+#endif
+#ifndef JNI64
 	"GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2",
+#else
+	"GetObjectA__JILorg_eclipse_swt_internal_win32_LOGPEN_2",
+#endif
+#ifndef JNI64
 	"GetObjectW__III",
+#else
+	"GetObjectW__JIJ",
+#endif
+#ifndef JNI64
 	"GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2",
+#else
+	"GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2",
+#endif
+#ifndef JNI64
 	"GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2",
+#else
+	"GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2",
+#endif
+#ifndef JNI64
 	"GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2",
+#else
+	"GetObjectW__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2",
+#endif
+#ifndef JNI64
 	"GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2",
+#else
+	"GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2",
+#endif
+#ifndef JNI64
 	"GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2",
+#else
+	"GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2",
+#endif
+#ifndef JNI64
 	"GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2",
+#else
+	"GetObjectW__JILorg_eclipse_swt_internal_win32_LOGPEN_2",
+#endif
 	"GetOpenFileNameA",
 	"GetOpenFileNameW",
 	"GetOutlineTextMetricsA",
@@ -431,8 +503,16 @@ char * OS_nativeFunctionNames[] = {
 	"ImmGetCompositionFontA",
 	"ImmGetCompositionFontW",
 	"ImmGetCompositionStringA",
+#ifndef JNI64
 	"ImmGetCompositionStringW__II_3CI",
+#else
+	"ImmGetCompositionStringW__JI_3CI",
+#endif
+#ifndef JNI64
 	"ImmGetCompositionStringW__II_3II",
+#else
+	"ImmGetCompositionStringW__JI_3II",
+#endif
 	"ImmGetContext",
 	"ImmGetConversionStatus",
 	"ImmGetDefaultIMEWnd",
@@ -487,10 +567,26 @@ char * OS_nativeFunctionNames[] = {
 	"LoadCursorW",
 	"LoadIconA",
 	"LoadIconW",
+#ifndef JNI64
 	"LoadImageA__IIIIII",
+#else
+	"LoadImageA__JJIIII",
+#endif
+#ifndef JNI64
 	"LoadImageA__I_3BIIII",
+#else
+	"LoadImageA__J_3BIIII",
+#endif
+#ifndef JNI64
 	"LoadImageW__IIIIII",
+#else
+	"LoadImageW__JJIIII",
+#endif
+#ifndef JNI64
 	"LoadImageW__I_3CIIII",
+#else
+	"LoadImageW__J_3CIIII",
+#endif
 	"LoadLibraryA",
 	"LoadLibraryW",
 	"LoadStringA",
@@ -514,105 +610,461 @@ char * OS_nativeFunctionNames[] = {
 	"MSG_1sizeof",
 	"MapVirtualKeyA",
 	"MapVirtualKeyW",
+#ifndef JNI64
 	"MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I",
+#else
+	"MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I",
+#endif
+#ifndef JNI64
 	"MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I",
+#else
+	"MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I",
+#endif
 	"MessageBeep",
 	"MessageBoxA",
 	"MessageBoxW",
 	"MonitorFromWindow",
+#ifndef JNI64
 	"MoveMemory__III",
+#else
+	"MoveMemory__JJI",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I",
+#else
+	"MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I",
+#endif
+#ifndef JNI64
 	"MoveMemory__I_3BI",
+#else
+	"MoveMemory__J_3BI",
+#endif
+#ifndef JNI64
 	"MoveMemory__I_3CI",
+#else
+	"MoveMemory__J_3CI",
+#endif
+#ifndef JNI64
 	"MoveMemory__I_3DI",
+#else
+	"MoveMemory__J_3DI",
+#endif
+#ifndef JNI64
 	"MoveMemory__I_3FI",
+#else
+	"MoveMemory__J_3FI",
+#endif
+#ifndef JNI64
 	"MoveMemory__I_3II",
+#else
+	"MoveMemory__J_3II",
+#endif
+#ifndef JNI64
 	"MoveMemory__I_3JI",
+#else
+	"MoveMemory__J_3JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__I_3SI",
+#else
+	"MoveMemory__J_3SI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI",
+#endif
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2_3BI",
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI",
+#endif
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI",
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II",
+#else
+	"MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI",
+#endif
+#ifndef JNI64
 	"MoveMemory___3BII",
+#else
+	"MoveMemory___3BJI",
+#endif
 	"MoveMemory___3BLorg_eclipse_swt_internal_win32_ACCEL_2I",
 	"MoveMemory___3BLorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2I",
+#ifndef JNI64
 	"MoveMemory___3CII",
+#else
+	"MoveMemory___3CJI",
+#endif
+#ifndef JNI64
 	"MoveMemory___3DII",
+#else
+	"MoveMemory___3DJI",
+#endif
+#ifndef JNI64
 	"MoveMemory___3FII",
+#else
+	"MoveMemory___3FJI",
+#endif
+#ifndef JNI64
 	"MoveMemory___3III",
+#else
+	"MoveMemory___3IJI",
+#endif
+#ifndef JNI64
 	"MoveMemory___3JII",
+#else
+	"MoveMemory___3JJI",
+#endif
+#ifndef JNI64
 	"MoveMemory___3SII",
+#else
+	"MoveMemory___3SJI",
+#endif
 	"MoveToEx",
 	"MsgWaitForMultipleObjectsEx",
+#ifndef JNI64
 	"MultiByteToWideChar__IIII_3CI",
+#else
+	"MultiByteToWideChar__IIJI_3CI",
+#endif
 	"MultiByteToWideChar__II_3BI_3CI",
 	"NMCUSTOMDRAW_1sizeof",
 	"NMHDR_1sizeof",
@@ -690,10 +1142,26 @@ char * OS_nativeFunctionNames[] = {
 	"RegOpenKeyExW",
 	"RegQueryInfoKeyA",
 	"RegQueryInfoKeyW",
+#ifndef JNI64
 	"RegQueryValueExA__I_3BI_3I_3B_3I",
+#else
+	"RegQueryValueExA__J_3BJ_3I_3B_3I",
+#endif
+#ifndef JNI64
 	"RegQueryValueExA__I_3BI_3I_3I_3I",
+#else
+	"RegQueryValueExA__J_3BJ_3I_3I_3I",
+#endif
+#ifndef JNI64
 	"RegQueryValueExW__I_3CI_3I_3C_3I",
+#else
+	"RegQueryValueExW__J_3CJ_3I_3C_3I",
+#endif
+#ifndef JNI64
 	"RegQueryValueExW__I_3CI_3I_3I_3I",
+#else
+	"RegQueryValueExW__J_3CJ_3I_3I_3I",
+#endif
 	"RegisterClassA",
 	"RegisterClassW",
 	"RegisterClipboardFormatA",
@@ -770,71 +1238,331 @@ char * OS_nativeFunctionNames[] = {
 	"SelectObject",
 	"SelectPalette",
 	"SendInput",
+#ifndef JNI64
 	"SendMessageA__IIII",
+#else
+	"SendMessageA__JIJJ",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDITEM_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_LITEM_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVITEM_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_MARGINS_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_POINT_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_RECT_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_SIZE_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCITEM_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVITEM_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2",
+#else
+	"SendMessageA__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2",
+#endif
+#ifndef JNI64
 	"SendMessageA__III_3B",
+#else
+	"SendMessageA__JIJ_3B",
+#endif
+#ifndef JNI64
 	"SendMessageA__III_3C",
+#else
+	"SendMessageA__JIJ_3C",
+#endif
+#ifndef JNI64
 	"SendMessageA__III_3I",
+#else
+	"SendMessageA__JIJ_3I",
+#endif
+#ifndef JNI64
 	"SendMessageA__III_3S",
+#else
+	"SendMessageA__JIJ_3S",
+#endif
+#ifndef JNI64
 	"SendMessageA__II_3II",
+#else
+	"SendMessageA__JI_3JJ",
+#endif
+#ifndef JNI64
 	"SendMessageA__II_3I_3I",
+#else
+	"SendMessageA__JI_3I_3I",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIII",
+#else
+	"SendMessageW__JIJJ",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDITEM_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_LITEM_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVITEM_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_MARGINS_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_POINT_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_RECT_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_SIZE_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCITEM_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVITEM_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2",
+#else
+	"SendMessageW__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2",
+#endif
+#ifndef JNI64
 	"SendMessageW__III_3C",
+#else
+	"SendMessageW__JIJ_3C",
+#endif
+#ifndef JNI64
 	"SendMessageW__III_3I",
+#else
+	"SendMessageW__JIJ_3I",
+#endif
+#ifndef JNI64
 	"SendMessageW__III_3S",
+#else
+	"SendMessageW__JIJ_3S",
+#endif
+#ifndef JNI64
 	"SendMessageW__II_3II",
+#else
+	"SendMessageW__JI_3JJ",
+#endif
+#ifndef JNI64
 	"SendMessageW__II_3I_3I",
+#else
+	"SendMessageW__JI_3I_3I",
+#endif
 	"SetActiveWindow",
 	"SetBkColor",
 	"SetBkMode",
@@ -951,25 +1679,85 @@ char * OS_nativeFunctionNames[] = {
 	"ValidateRect",
 	"VkKeyScanA",
 	"VkKeyScanW",
+#ifndef JNI64
 	"VtblCall__II",
+#else
+	"VtblCall__IJ",
+#endif
+#ifndef JNI64
 	"VtblCall__III",
+#else
+	"VtblCall__IJI",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIII_3I",
+#else
+	"VtblCall__IJIII_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIIJI_3J",
+#else
+	"VtblCall__IJIJI_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__III_3I_3I",
+#else
+	"VtblCall__IJI_3J_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJ",
+#else
+	"VtblCall__IJJ",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJII_3J",
+#else
+	"VtblCall__IJJII_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IIJJI_3J",
+#else
+	"VtblCall__IJJJI_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2",
+#else
+	"VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2",
+#endif
+#ifndef JNI64
 	"VtblCall__IIS_3B_3B_3B",
+#else
+	"VtblCall__IJS_3B_3B_3B",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3B_3I",
+#else
+	"VtblCall__IJ_3B_3J",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3CII_3I_3I",
+#else
+	"VtblCall__IJ_3CII_3I_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3I",
+#else
+	"VtblCall__IJ_3I",
+#endif
+#ifndef JNI64
 	"VtblCall__II_3J",
+#else
+	"VtblCall__IJ_3J",
+#endif
 	"WINDOWPLACEMENT_1sizeof",
 	"WINDOWPOS_1sizeof",
 	"WNDCLASS_1sizeof",
 	"WaitMessage",
+#ifndef JNI64
 	"WideCharToMultiByte__II_3CIII_3B_3Z",
+#else
+	"WideCharToMultiByte__II_3CIJI_3B_3Z",
+#endif
 	"WideCharToMultiByte__II_3CI_3BI_3B_3Z",
 	"WindowFromDC",
 	"WindowFromPoint",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h
index 11e0f119f5..ac68f3bfa7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_stats.h
@@ -103,13 +103,29 @@ typedef enum {
 	CreateCursor_FUNC,
 	CreateDCA_FUNC,
 	CreateDCW_FUNC,
+#ifndef JNI64
 	CreateDIBSection__III_3III_FUNC,
+#else
+	CreateDIBSection__JJI_3JJI_FUNC,
+#endif
+#ifndef JNI64
 	CreateDIBSection__I_3BI_3III_FUNC,
+#else
+	CreateDIBSection__J_3BI_3JJI_FUNC,
+#endif
 	CreateEnhMetaFileA_FUNC,
 	CreateEnhMetaFileW_FUNC,
+#ifndef JNI64
 	CreateFontIndirectA__I_FUNC,
+#else
+	CreateFontIndirectA__J_FUNC,
+#endif
 	CreateFontIndirectA__Lorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC,
+#ifndef JNI64
 	CreateFontIndirectW__I_FUNC,
+#else
+	CreateFontIndirectW__J_FUNC,
+#endif
 	CreateFontIndirectW__Lorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC,
 	CreateIconIndirect_FUNC,
 	CreateMenu_FUNC,
@@ -301,20 +317,76 @@ typedef enum {
 	GetMonitorInfoA_FUNC,
 	GetMonitorInfoW_FUNC,
 	GetNearestPaletteIndex_FUNC,
+#ifndef JNI64
 	GetObjectA__III_FUNC,
+#else
+	GetObjectA__JIJ_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectA__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC,
+#else
+	GetObjectA__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectA__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC,
+#else
+	GetObjectA__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectA__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC,
+#else
+	GetObjectA__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectA__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC,
+#else
+	GetObjectA__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectA__IILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC,
+#else
+	GetObjectA__JILorg_eclipse_swt_internal_win32_LOGFONTA_2_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectA__IILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC,
+#else
+	GetObjectA__JILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectW__III_FUNC,
+#else
+	GetObjectW__JIJ_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectW__IILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC,
+#else
+	GetObjectW__JILorg_eclipse_swt_internal_win32_BITMAP_2_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectW__IILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC,
+#else
+	GetObjectW__JILorg_eclipse_swt_internal_win32_DIBSECTION_2_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectW__IILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC,
+#else
+	GetObjectW__JILorg_eclipse_swt_internal_win32_EXTLOGPEN_2_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectW__IILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC,
+#else
+	GetObjectW__JILorg_eclipse_swt_internal_win32_LOGBRUSH_2_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectW__IILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC,
+#else
+	GetObjectW__JILorg_eclipse_swt_internal_win32_LOGFONTW_2_FUNC,
+#endif
+#ifndef JNI64
 	GetObjectW__IILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC,
+#else
+	GetObjectW__JILorg_eclipse_swt_internal_win32_LOGPEN_2_FUNC,
+#endif
 	GetOpenFileNameA_FUNC,
 	GetOpenFileNameW_FUNC,
 	GetOutlineTextMetricsA_FUNC,
@@ -439,8 +511,16 @@ typedef enum {
 	ImmGetCompositionFontA_FUNC,
 	ImmGetCompositionFontW_FUNC,
 	ImmGetCompositionStringA_FUNC,
+#ifndef JNI64
 	ImmGetCompositionStringW__II_3CI_FUNC,
+#else
+	ImmGetCompositionStringW__JI_3CI_FUNC,
+#endif
+#ifndef JNI64
 	ImmGetCompositionStringW__II_3II_FUNC,
+#else
+	ImmGetCompositionStringW__JI_3II_FUNC,
+#endif
 	ImmGetContext_FUNC,
 	ImmGetConversionStatus_FUNC,
 	ImmGetDefaultIMEWnd_FUNC,
@@ -495,10 +575,26 @@ typedef enum {
 	LoadCursorW_FUNC,
 	LoadIconA_FUNC,
 	LoadIconW_FUNC,
+#ifndef JNI64
 	LoadImageA__IIIIII_FUNC,
+#else
+	LoadImageA__JJIIII_FUNC,
+#endif
+#ifndef JNI64
 	LoadImageA__I_3BIIII_FUNC,
+#else
+	LoadImageA__J_3BIIII_FUNC,
+#endif
+#ifndef JNI64
 	LoadImageW__IIIIII_FUNC,
+#else
+	LoadImageW__JJIIII_FUNC,
+#endif
+#ifndef JNI64
 	LoadImageW__I_3CIIII_FUNC,
+#else
+	LoadImageW__J_3CIIII_FUNC,
+#endif
 	LoadLibraryA_FUNC,
 	LoadLibraryW_FUNC,
 	LoadStringA_FUNC,
@@ -522,105 +618,461 @@ typedef enum {
 	MSG_1sizeof_FUNC,
 	MapVirtualKeyA_FUNC,
 	MapVirtualKeyW_FUNC,
+#ifndef JNI64
 	MapWindowPoints__IILorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
+#else
+	MapWindowPoints__JJLorg_eclipse_swt_internal_win32_POINT_2I_FUNC,
+#endif
+#ifndef JNI64
 	MapWindowPoints__IILorg_eclipse_swt_internal_win32_RECT_2I_FUNC,
+#else
+	MapWindowPoints__JJLorg_eclipse_swt_internal_win32_RECT_2I_FUNC,
+#endif
 	MessageBeep_FUNC,
 	MessageBoxA_FUNC,
 	MessageBoxW_FUNC,
 	MonitorFromWindow_FUNC,
+#ifndef JNI64
 	MoveMemory__III_FUNC,
+#else
+	MoveMemory__JJI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_DROPFILES_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_GRADIENT_1RECT_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_KEYBDINPUT_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTA_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_LOGFONTW_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_MINMAXINFO_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_MOUSEINPUT_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_MSG_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_MSG_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_NMLVDISPINFO_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_NMTVDISPINFO_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_OPENFILENAME_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_RECT_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_RECT_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_TRIVERTEX_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_UDACCEL_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__ILorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC,
+#else
+	MoveMemory__JLorg_eclipse_swt_internal_win32_WINDOWPOS_2I_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__I_3BI_FUNC,
+#else
+	MoveMemory__J_3BI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__I_3CI_FUNC,
+#else
+	MoveMemory__J_3CI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__I_3DI_FUNC,
+#else
+	MoveMemory__J_3DI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__I_3FI_FUNC,
+#else
+	MoveMemory__J_3FI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__I_3II_FUNC,
+#else
+	MoveMemory__J_3II_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__I_3JI_FUNC,
+#else
+	MoveMemory__J_3JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__I_3SI_FUNC,
+#else
+	MoveMemory__J_3SI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2JI_FUNC,
+#endif
 	MoveMemory__Lorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2_3BI_FUNC,
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_DOCHOSTUIINFO_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_DRAWITEMSTRUCT_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_EMREXTCREATEFONTINDIRECTW_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_EMR_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_EXTLOGPEN_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_HDITEM_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_HELPINFO_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTA_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_LOGFONTW_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_MEASUREITEMSTRUCT_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_MINMAXINFO_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_MSG_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMCUSTOMDRAW_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMHDR_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMHEADER_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMLINK_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMLISTVIEW_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVCUSTOMDRAW_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVDISPINFO_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVFINDITEM_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMLVODSTATECHANGE_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHEVRON_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMREBARCHILDSIZE_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMRGINFO_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTBHOTITEM_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTOOLBAR_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTREEVIEW_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTCUSTOMDRAW_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOA_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTTDISPINFOW_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVCUSTOMDRAW_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVDISPINFO_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMTVITEMCHANGE_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_NMUPDOWN_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_OFNOTIFY_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_OPENFILENAME_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2JI_FUNC,
+#endif
 	MoveMemory__Lorg_eclipse_swt_internal_win32_POINT_2_3JI_FUNC,
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_RECT_2_3JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1ITEM_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1LOGATTR_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_SCRIPT_1PROPERTIES_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICA_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_TEXTMETRICW_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_TVITEM_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_UDACCEL_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2II_FUNC,
+#else
+	MoveMemory__Lorg_eclipse_swt_internal_win32_WINDOWPOS_2JI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory___3BII_FUNC,
+#else
+	MoveMemory___3BJI_FUNC,
+#endif
 	MoveMemory___3BLorg_eclipse_swt_internal_win32_ACCEL_2I_FUNC,
 	MoveMemory___3BLorg_eclipse_swt_internal_win32_BITMAPINFOHEADER_2I_FUNC,
+#ifndef JNI64
 	MoveMemory___3CII_FUNC,
+#else
+	MoveMemory___3CJI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory___3DII_FUNC,
+#else
+	MoveMemory___3DJI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory___3FII_FUNC,
+#else
+	MoveMemory___3FJI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory___3III_FUNC,
+#else
+	MoveMemory___3IJI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory___3JII_FUNC,
+#else
+	MoveMemory___3JJI_FUNC,
+#endif
+#ifndef JNI64
 	MoveMemory___3SII_FUNC,
+#else
+	MoveMemory___3SJI_FUNC,
+#endif
 	MoveToEx_FUNC,
 	MsgWaitForMultipleObjectsEx_FUNC,
+#ifndef JNI64
 	MultiByteToWideChar__IIII_3CI_FUNC,
+#else
+	MultiByteToWideChar__IIJI_3CI_FUNC,
+#endif
 	MultiByteToWideChar__II_3BI_3CI_FUNC,
 	NMCUSTOMDRAW_1sizeof_FUNC,
 	NMHDR_1sizeof_FUNC,
@@ -698,10 +1150,26 @@ typedef enum {
 	RegOpenKeyExW_FUNC,
 	RegQueryInfoKeyA_FUNC,
 	RegQueryInfoKeyW_FUNC,
+#ifndef JNI64
 	RegQueryValueExA__I_3BI_3I_3B_3I_FUNC,
+#else
+	RegQueryValueExA__J_3BJ_3I_3B_3I_FUNC,
+#endif
+#ifndef JNI64
 	RegQueryValueExA__I_3BI_3I_3I_3I_FUNC,
+#else
+	RegQueryValueExA__J_3BJ_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	RegQueryValueExW__I_3CI_3I_3C_3I_FUNC,
+#else
+	RegQueryValueExW__J_3CJ_3I_3C_3I_FUNC,
+#endif
+#ifndef JNI64
 	RegQueryValueExW__I_3CI_3I_3I_3I_FUNC,
+#else
+	RegQueryValueExW__J_3CJ_3I_3I_3I_FUNC,
+#endif
 	RegisterClassA_FUNC,
 	RegisterClassW_FUNC,
 	RegisterClipboardFormatA_FUNC,
@@ -778,71 +1246,331 @@ typedef enum {
 	SelectObject_FUNC,
 	SelectPalette_FUNC,
 	SendInput_FUNC,
+#ifndef JNI64
 	SendMessageA__IIII_FUNC,
+#else
+	SendMessageA__JIJJ_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_POINT_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_POINT_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC,
+#else
+	SendMessageA__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__III_3B_FUNC,
+#else
+	SendMessageA__JIJ_3B_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__III_3C_FUNC,
+#else
+	SendMessageA__JIJ_3C_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__III_3I_FUNC,
+#else
+	SendMessageA__JIJ_3I_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__III_3S_FUNC,
+#else
+	SendMessageA__JIJ_3S_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__II_3II_FUNC,
+#else
+	SendMessageA__JI_3JJ_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageA__II_3I_3I_FUNC,
+#else
+	SendMessageA__JI_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIII_FUNC,
+#else
+	SendMessageW__JIJJ_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_BUTTON_1IMAGELIST_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDHITTESTINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_HDITEM_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDITEM_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_HDLAYOUT_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_LITEM_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_LITEM_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVCOLUMN_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVHITTESTINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_LVITEM_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_LVITEM_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_MARGINS_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_MARGINS_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_MCHITTESTINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_POINT_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_POINT_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_REBARBANDINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_RECT_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_SHDRAGIMAGE_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_SIZE_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_SYSTEMTIME_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTONINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TBBUTTON_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCHITTESTINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_TCITEM_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TCITEM_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TOOLINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVHITTESTINFO_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVINSERTSTRUCT_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_TVITEM_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVITEM_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_TVSORTCB_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__IIILorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC,
+#else
+	SendMessageW__JIJLorg_eclipse_swt_internal_win32_UDACCEL_2_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__III_3C_FUNC,
+#else
+	SendMessageW__JIJ_3C_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__III_3I_FUNC,
+#else
+	SendMessageW__JIJ_3I_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__III_3S_FUNC,
+#else
+	SendMessageW__JIJ_3S_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__II_3II_FUNC,
+#else
+	SendMessageW__JI_3JJ_FUNC,
+#endif
+#ifndef JNI64
 	SendMessageW__II_3I_3I_FUNC,
+#else
+	SendMessageW__JI_3I_3I_FUNC,
+#endif
 	SetActiveWindow_FUNC,
 	SetBkColor_FUNC,
 	SetBkMode_FUNC,
@@ -959,25 +1687,85 @@ typedef enum {
 	ValidateRect_FUNC,
 	VkKeyScanA_FUNC,
 	VkKeyScanW_FUNC,
+#ifndef JNI64
 	VtblCall__II_FUNC,
+#else
+	VtblCall__IJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_FUNC,
+#else
+	VtblCall__IJI_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIII_3I_FUNC,
+#else
+	VtblCall__IJIII_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIIJI_3J_FUNC,
+#else
+	VtblCall__IJIJI_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__III_3I_3I_FUNC,
+#else
+	VtblCall__IJI_3J_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJ_FUNC,
+#else
+	VtblCall__IJJ_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJII_3J_FUNC,
+#else
+	VtblCall__IJJII_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIJJI_3J_FUNC,
+#else
+	VtblCall__IJJJI_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IILorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC,
+#else
+	VtblCall__IJLorg_eclipse_swt_internal_win32_TF_1DISPLAYATTRIBUTE_2_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__IIS_3B_3B_3B_FUNC,
+#else
+	VtblCall__IJS_3B_3B_3B_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3B_3I_FUNC,
+#else
+	VtblCall__IJ_3B_3J_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3CII_3I_3I_FUNC,
+#else
+	VtblCall__IJ_3CII_3I_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3I_FUNC,
+#else
+	VtblCall__IJ_3I_FUNC,
+#endif
+#ifndef JNI64
 	VtblCall__II_3J_FUNC,
+#else
+	VtblCall__IJ_3J_FUNC,
+#endif
 	WINDOWPLACEMENT_1sizeof_FUNC,
 	WINDOWPOS_1sizeof_FUNC,
 	WNDCLASS_1sizeof_FUNC,
 	WaitMessage_FUNC,
+#ifndef JNI64
 	WideCharToMultiByte__II_3CIII_3B_3Z_FUNC,
+#else
+	WideCharToMultiByte__II_3CIJI_3B_3Z_FUNC,
+#endif
 	WideCharToMultiByte__II_3CI_3BI_3B_3Z_FUNC,
 	WindowFromDC_FUNC,
 	WindowFromPoint_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c
index f734ef1d42..5c030f1d80 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_structs.c
@@ -64,13 +64,13 @@ void cacheACTCTXFields(JNIEnv *env, jobject lpObject)
 	ACTCTXFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	ACTCTXFc.cbSize = (*env)->GetFieldID(env, ACTCTXFc.clazz, "cbSize", "I");
 	ACTCTXFc.dwFlags = (*env)->GetFieldID(env, ACTCTXFc.clazz, "dwFlags", "I");
-	ACTCTXFc.lpSource = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpSource", "I");
+	ACTCTXFc.lpSource = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpSource", I_J);
 	ACTCTXFc.wProcessorArchitecture = (*env)->GetFieldID(env, ACTCTXFc.clazz, "wProcessorArchitecture", "S");
 	ACTCTXFc.wLangId = (*env)->GetFieldID(env, ACTCTXFc.clazz, "wLangId", "S");
-	ACTCTXFc.lpAssemblyDirectory = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpAssemblyDirectory", "I");
-	ACTCTXFc.lpResourceName = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpResourceName", "I");
-	ACTCTXFc.lpApplicationName = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpApplicationName", "I");
-	ACTCTXFc.hModule = (*env)->GetFieldID(env, ACTCTXFc.clazz, "hModule", "I");
+	ACTCTXFc.lpAssemblyDirectory = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpAssemblyDirectory", I_J);
+	ACTCTXFc.lpResourceName = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpResourceName", I_J);
+	ACTCTXFc.lpApplicationName = (*env)->GetFieldID(env, ACTCTXFc.clazz, "lpApplicationName", I_J);
+	ACTCTXFc.hModule = (*env)->GetFieldID(env, ACTCTXFc.clazz, "hModule", I_J);
 	ACTCTXFc.cached = 1;
 }
 
@@ -79,13 +79,13 @@ ACTCTX *getACTCTXFields(JNIEnv *env, jobject lpObject, ACTCTX *lpStruct)
 	if (!ACTCTXFc.cached) cacheACTCTXFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, ACTCTXFc.cbSize);
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, ACTCTXFc.dwFlags);
-	lpStruct->lpSource = (LPCTSTR)(*env)->GetIntField(env, lpObject, ACTCTXFc.lpSource);
+	lpStruct->lpSource = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, ACTCTXFc.lpSource);
 	lpStruct->wProcessorArchitecture = (*env)->GetShortField(env, lpObject, ACTCTXFc.wProcessorArchitecture);
 	lpStruct->wLangId = (*env)->GetShortField(env, lpObject, ACTCTXFc.wLangId);
-	lpStruct->lpAssemblyDirectory = (LPCTSTR)(*env)->GetIntField(env, lpObject, ACTCTXFc.lpAssemblyDirectory);
-	lpStruct->lpResourceName = (LPCTSTR)(*env)->GetIntField(env, lpObject, ACTCTXFc.lpResourceName);
-	lpStruct->lpApplicationName = (LPCTSTR)(*env)->GetIntField(env, lpObject, ACTCTXFc.lpApplicationName);
-	lpStruct->hModule = (HMODULE)(*env)->GetIntField(env, lpObject, ACTCTXFc.hModule);
+	lpStruct->lpAssemblyDirectory = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, ACTCTXFc.lpAssemblyDirectory);
+	lpStruct->lpResourceName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, ACTCTXFc.lpResourceName);
+	lpStruct->lpApplicationName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, ACTCTXFc.lpApplicationName);
+	lpStruct->hModule = (HMODULE)(*env)->GetIntLongField(env, lpObject, ACTCTXFc.hModule);
 	return lpStruct;
 }
 
@@ -94,13 +94,13 @@ void setACTCTXFields(JNIEnv *env, jobject lpObject, ACTCTX *lpStruct)
 	if (!ACTCTXFc.cached) cacheACTCTXFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, ACTCTXFc.cbSize, (jint)lpStruct->cbSize);
 	(*env)->SetIntField(env, lpObject, ACTCTXFc.dwFlags, (jint)lpStruct->dwFlags);
-	(*env)->SetIntField(env, lpObject, ACTCTXFc.lpSource, (jint)lpStruct->lpSource);
+	(*env)->SetIntLongField(env, lpObject, ACTCTXFc.lpSource, (jintLong)lpStruct->lpSource);
 	(*env)->SetShortField(env, lpObject, ACTCTXFc.wProcessorArchitecture, (jshort)lpStruct->wProcessorArchitecture);
 	(*env)->SetShortField(env, lpObject, ACTCTXFc.wLangId, (jshort)lpStruct->wLangId);
-	(*env)->SetIntField(env, lpObject, ACTCTXFc.lpAssemblyDirectory, (jint)lpStruct->lpAssemblyDirectory);
-	(*env)->SetIntField(env, lpObject, ACTCTXFc.lpResourceName, (jint)lpStruct->lpResourceName);
-	(*env)->SetIntField(env, lpObject, ACTCTXFc.lpApplicationName, (jint)lpStruct->lpApplicationName);
-	(*env)->SetIntField(env, lpObject, ACTCTXFc.hModule, (jint)lpStruct->hModule);
+	(*env)->SetIntLongField(env, lpObject, ACTCTXFc.lpAssemblyDirectory, (jintLong)lpStruct->lpAssemblyDirectory);
+	(*env)->SetIntLongField(env, lpObject, ACTCTXFc.lpResourceName, (jintLong)lpStruct->lpResourceName);
+	(*env)->SetIntLongField(env, lpObject, ACTCTXFc.lpApplicationName, (jintLong)lpStruct->lpApplicationName);
+	(*env)->SetIntLongField(env, lpObject, ACTCTXFc.hModule, (jintLong)lpStruct->hModule);
 }
 #endif
 
@@ -123,7 +123,7 @@ void cacheBITMAPFields(JNIEnv *env, jobject lpObject)
 	BITMAPFc.bmWidthBytes = (*env)->GetFieldID(env, BITMAPFc.clazz, "bmWidthBytes", "I");
 	BITMAPFc.bmPlanes = (*env)->GetFieldID(env, BITMAPFc.clazz, "bmPlanes", "S");
 	BITMAPFc.bmBitsPixel = (*env)->GetFieldID(env, BITMAPFc.clazz, "bmBitsPixel", "S");
-	BITMAPFc.bmBits = (*env)->GetFieldID(env, BITMAPFc.clazz, "bmBits", "I");
+	BITMAPFc.bmBits = (*env)->GetFieldID(env, BITMAPFc.clazz, "bmBits", I_J);
 	BITMAPFc.cached = 1;
 }
 
@@ -136,7 +136,7 @@ BITMAP *getBITMAPFields(JNIEnv *env, jobject lpObject, BITMAP *lpStruct)
 	lpStruct->bmWidthBytes = (*env)->GetIntField(env, lpObject, BITMAPFc.bmWidthBytes);
 	lpStruct->bmPlanes = (*env)->GetShortField(env, lpObject, BITMAPFc.bmPlanes);
 	lpStruct->bmBitsPixel = (*env)->GetShortField(env, lpObject, BITMAPFc.bmBitsPixel);
-	lpStruct->bmBits = (LPVOID)(*env)->GetIntField(env, lpObject, BITMAPFc.bmBits);
+	lpStruct->bmBits = (LPVOID)(*env)->GetIntLongField(env, lpObject, BITMAPFc.bmBits);
 	return lpStruct;
 }
 
@@ -149,7 +149,7 @@ void setBITMAPFields(JNIEnv *env, jobject lpObject, BITMAP *lpStruct)
 	(*env)->SetIntField(env, lpObject, BITMAPFc.bmWidthBytes, (jint)lpStruct->bmWidthBytes);
 	(*env)->SetShortField(env, lpObject, BITMAPFc.bmPlanes, (jshort)lpStruct->bmPlanes);
 	(*env)->SetShortField(env, lpObject, BITMAPFc.bmBitsPixel, (jshort)lpStruct->bmBitsPixel);
-	(*env)->SetIntField(env, lpObject, BITMAPFc.bmBits, (jint)lpStruct->bmBits);
+	(*env)->SetIntLongField(env, lpObject, BITMAPFc.bmBits, (jintLong)lpStruct->bmBits);
 }
 #endif
 
@@ -269,8 +269,8 @@ void cacheBP_PAINTPARAMSFields(JNIEnv *env, jobject lpObject)
 	BP_PAINTPARAMSFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	BP_PAINTPARAMSFc.cbSize = (*env)->GetFieldID(env, BP_PAINTPARAMSFc.clazz, "cbSize", "I");
 	BP_PAINTPARAMSFc.dwFlags = (*env)->GetFieldID(env, BP_PAINTPARAMSFc.clazz, "dwFlags", "I");
-	BP_PAINTPARAMSFc.prcExclude = (*env)->GetFieldID(env, BP_PAINTPARAMSFc.clazz, "prcExclude", "I");
-	BP_PAINTPARAMSFc.pBlendFunction = (*env)->GetFieldID(env, BP_PAINTPARAMSFc.clazz, "pBlendFunction", "I");
+	BP_PAINTPARAMSFc.prcExclude = (*env)->GetFieldID(env, BP_PAINTPARAMSFc.clazz, "prcExclude", I_J);
+	BP_PAINTPARAMSFc.pBlendFunction = (*env)->GetFieldID(env, BP_PAINTPARAMSFc.clazz, "pBlendFunction", I_J);
 	BP_PAINTPARAMSFc.cached = 1;
 }
 
@@ -279,8 +279,8 @@ BP_PAINTPARAMS *getBP_PAINTPARAMSFields(JNIEnv *env, jobject lpObject, BP_PAINTP
 	if (!BP_PAINTPARAMSFc.cached) cacheBP_PAINTPARAMSFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, BP_PAINTPARAMSFc.cbSize);
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, BP_PAINTPARAMSFc.dwFlags);
-	lpStruct->prcExclude = (RECT*)(*env)->GetIntField(env, lpObject, BP_PAINTPARAMSFc.prcExclude);
-	lpStruct->pBlendFunction = (BLENDFUNCTION*)(*env)->GetIntField(env, lpObject, BP_PAINTPARAMSFc.pBlendFunction);
+	lpStruct->prcExclude = (RECT*)(*env)->GetIntLongField(env, lpObject, BP_PAINTPARAMSFc.prcExclude);
+	lpStruct->pBlendFunction = (BLENDFUNCTION*)(*env)->GetIntLongField(env, lpObject, BP_PAINTPARAMSFc.pBlendFunction);
 	return lpStruct;
 }
 
@@ -289,8 +289,8 @@ void setBP_PAINTPARAMSFields(JNIEnv *env, jobject lpObject, BP_PAINTPARAMS *lpSt
 	if (!BP_PAINTPARAMSFc.cached) cacheBP_PAINTPARAMSFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, BP_PAINTPARAMSFc.cbSize, (jint)lpStruct->cbSize);
 	(*env)->SetIntField(env, lpObject, BP_PAINTPARAMSFc.dwFlags, (jint)lpStruct->dwFlags);
-	(*env)->SetIntField(env, lpObject, BP_PAINTPARAMSFc.prcExclude, (jint)lpStruct->prcExclude);
-	(*env)->SetIntField(env, lpObject, BP_PAINTPARAMSFc.pBlendFunction, (jint)lpStruct->pBlendFunction);
+	(*env)->SetIntLongField(env, lpObject, BP_PAINTPARAMSFc.prcExclude, (jintLong)lpStruct->prcExclude);
+	(*env)->SetIntLongField(env, lpObject, BP_PAINTPARAMSFc.pBlendFunction, (jintLong)lpStruct->pBlendFunction);
 }
 #endif
 
@@ -307,13 +307,13 @@ void cacheBROWSEINFOFields(JNIEnv *env, jobject lpObject)
 {
 	if (BROWSEINFOFc.cached) return;
 	BROWSEINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	BROWSEINFOFc.hwndOwner = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "hwndOwner", "I");
-	BROWSEINFOFc.pidlRoot = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "pidlRoot", "I");
-	BROWSEINFOFc.pszDisplayName = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "pszDisplayName", "I");
-	BROWSEINFOFc.lpszTitle = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lpszTitle", "I");
+	BROWSEINFOFc.hwndOwner = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "hwndOwner", I_J);
+	BROWSEINFOFc.pidlRoot = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "pidlRoot", I_J);
+	BROWSEINFOFc.pszDisplayName = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "pszDisplayName", I_J);
+	BROWSEINFOFc.lpszTitle = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lpszTitle", I_J);
 	BROWSEINFOFc.ulFlags = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "ulFlags", "I");
-	BROWSEINFOFc.lpfn = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lpfn", "I");
-	BROWSEINFOFc.lParam = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lParam", "I");
+	BROWSEINFOFc.lpfn = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lpfn", I_J);
+	BROWSEINFOFc.lParam = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "lParam", I_J);
 	BROWSEINFOFc.iImage = (*env)->GetFieldID(env, BROWSEINFOFc.clazz, "iImage", "I");
 	BROWSEINFOFc.cached = 1;
 }
@@ -321,13 +321,13 @@ void cacheBROWSEINFOFields(JNIEnv *env, jobject lpObject)
 BROWSEINFO *getBROWSEINFOFields(JNIEnv *env, jobject lpObject, BROWSEINFO *lpStruct)
 {
 	if (!BROWSEINFOFc.cached) cacheBROWSEINFOFields(env, lpObject);
-	lpStruct->hwndOwner = (HWND)(*env)->GetIntField(env, lpObject, BROWSEINFOFc.hwndOwner);
-	lpStruct->pidlRoot = (LPCITEMIDLIST)(*env)->GetIntField(env, lpObject, BROWSEINFOFc.pidlRoot);
-	lpStruct->pszDisplayName = (LPTSTR)(*env)->GetIntField(env, lpObject, BROWSEINFOFc.pszDisplayName);
-	lpStruct->lpszTitle = (LPCTSTR)(*env)->GetIntField(env, lpObject, BROWSEINFOFc.lpszTitle);
+	lpStruct->hwndOwner = (HWND)(*env)->GetIntLongField(env, lpObject, BROWSEINFOFc.hwndOwner);
+	lpStruct->pidlRoot = (LPCITEMIDLIST)(*env)->GetIntLongField(env, lpObject, BROWSEINFOFc.pidlRoot);
+	lpStruct->pszDisplayName = (LPTSTR)(*env)->GetIntLongField(env, lpObject, BROWSEINFOFc.pszDisplayName);
+	lpStruct->lpszTitle = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, BROWSEINFOFc.lpszTitle);
 	lpStruct->ulFlags = (*env)->GetIntField(env, lpObject, BROWSEINFOFc.ulFlags);
-	lpStruct->lpfn = (BFFCALLBACK)(*env)->GetIntField(env, lpObject, BROWSEINFOFc.lpfn);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, BROWSEINFOFc.lParam);
+	lpStruct->lpfn = (BFFCALLBACK)(*env)->GetIntLongField(env, lpObject, BROWSEINFOFc.lpfn);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, BROWSEINFOFc.lParam);
 	lpStruct->iImage = (*env)->GetIntField(env, lpObject, BROWSEINFOFc.iImage);
 	return lpStruct;
 }
@@ -335,13 +335,13 @@ BROWSEINFO *getBROWSEINFOFields(JNIEnv *env, jobject lpObject, BROWSEINFO *lpStr
 void setBROWSEINFOFields(JNIEnv *env, jobject lpObject, BROWSEINFO *lpStruct)
 {
 	if (!BROWSEINFOFc.cached) cacheBROWSEINFOFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, BROWSEINFOFc.hwndOwner, (jint)lpStruct->hwndOwner);
-	(*env)->SetIntField(env, lpObject, BROWSEINFOFc.pidlRoot, (jint)lpStruct->pidlRoot);
-	(*env)->SetIntField(env, lpObject, BROWSEINFOFc.pszDisplayName, (jint)lpStruct->pszDisplayName);
-	(*env)->SetIntField(env, lpObject, BROWSEINFOFc.lpszTitle, (jint)lpStruct->lpszTitle);
+	(*env)->SetIntLongField(env, lpObject, BROWSEINFOFc.hwndOwner, (jintLong)lpStruct->hwndOwner);
+	(*env)->SetIntLongField(env, lpObject, BROWSEINFOFc.pidlRoot, (jintLong)lpStruct->pidlRoot);
+	(*env)->SetIntLongField(env, lpObject, BROWSEINFOFc.pszDisplayName, (jintLong)lpStruct->pszDisplayName);
+	(*env)->SetIntLongField(env, lpObject, BROWSEINFOFc.lpszTitle, (jintLong)lpStruct->lpszTitle);
 	(*env)->SetIntField(env, lpObject, BROWSEINFOFc.ulFlags, (jint)lpStruct->ulFlags);
-	(*env)->SetIntField(env, lpObject, BROWSEINFOFc.lpfn, (jint)lpStruct->lpfn);
-	(*env)->SetIntField(env, lpObject, BROWSEINFOFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, BROWSEINFOFc.lpfn, (jintLong)lpStruct->lpfn);
+	(*env)->SetIntLongField(env, lpObject, BROWSEINFOFc.lParam, (jintLong)lpStruct->lParam);
 	(*env)->SetIntField(env, lpObject, BROWSEINFOFc.iImage, (jint)lpStruct->iImage);
 }
 #endif
@@ -359,7 +359,7 @@ void cacheBUTTON_IMAGELISTFields(JNIEnv *env, jobject lpObject)
 {
 	if (BUTTON_IMAGELISTFc.cached) return;
 	BUTTON_IMAGELISTFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	BUTTON_IMAGELISTFc.himl = (*env)->GetFieldID(env, BUTTON_IMAGELISTFc.clazz, "himl", "I");
+	BUTTON_IMAGELISTFc.himl = (*env)->GetFieldID(env, BUTTON_IMAGELISTFc.clazz, "himl", I_J);
 	BUTTON_IMAGELISTFc.margin_left = (*env)->GetFieldID(env, BUTTON_IMAGELISTFc.clazz, "margin_left", "I");
 	BUTTON_IMAGELISTFc.margin_top = (*env)->GetFieldID(env, BUTTON_IMAGELISTFc.clazz, "margin_top", "I");
 	BUTTON_IMAGELISTFc.margin_right = (*env)->GetFieldID(env, BUTTON_IMAGELISTFc.clazz, "margin_right", "I");
@@ -371,7 +371,7 @@ void cacheBUTTON_IMAGELISTFields(JNIEnv *env, jobject lpObject)
 BUTTON_IMAGELIST *getBUTTON_IMAGELISTFields(JNIEnv *env, jobject lpObject, BUTTON_IMAGELIST *lpStruct)
 {
 	if (!BUTTON_IMAGELISTFc.cached) cacheBUTTON_IMAGELISTFields(env, lpObject);
-	lpStruct->himl = (HIMAGELIST)(*env)->GetIntField(env, lpObject, BUTTON_IMAGELISTFc.himl);
+	lpStruct->himl = (HIMAGELIST)(*env)->GetIntLongField(env, lpObject, BUTTON_IMAGELISTFc.himl);
 	lpStruct->margin.left = (LONG)(*env)->GetIntField(env, lpObject, BUTTON_IMAGELISTFc.margin_left);
 	lpStruct->margin.top = (LONG)(*env)->GetIntField(env, lpObject, BUTTON_IMAGELISTFc.margin_top);
 	lpStruct->margin.right = (LONG)(*env)->GetIntField(env, lpObject, BUTTON_IMAGELISTFc.margin_right);
@@ -383,7 +383,7 @@ BUTTON_IMAGELIST *getBUTTON_IMAGELISTFields(JNIEnv *env, jobject lpObject, BUTTO
 void setBUTTON_IMAGELISTFields(JNIEnv *env, jobject lpObject, BUTTON_IMAGELIST *lpStruct)
 {
 	if (!BUTTON_IMAGELISTFc.cached) cacheBUTTON_IMAGELISTFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, BUTTON_IMAGELISTFc.himl, (jint)lpStruct->himl);
+	(*env)->SetIntLongField(env, lpObject, BUTTON_IMAGELISTFc.himl, (jintLong)lpStruct->himl);
 	(*env)->SetIntField(env, lpObject, BUTTON_IMAGELISTFc.margin_left, (jint)lpStruct->margin.left);
 	(*env)->SetIntField(env, lpObject, BUTTON_IMAGELISTFc.margin_top, (jint)lpStruct->margin.top);
 	(*env)->SetIntField(env, lpObject, BUTTON_IMAGELISTFc.margin_right, (jint)lpStruct->margin.right);
@@ -458,14 +458,14 @@ void cacheCHOOSECOLORFields(JNIEnv *env, jobject lpObject)
 	if (CHOOSECOLORFc.cached) return;
 	CHOOSECOLORFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	CHOOSECOLORFc.lStructSize = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lStructSize", "I");
-	CHOOSECOLORFc.hwndOwner = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "hwndOwner", "I");
-	CHOOSECOLORFc.hInstance = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "hInstance", "I");
+	CHOOSECOLORFc.hwndOwner = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "hwndOwner", I_J);
+	CHOOSECOLORFc.hInstance = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "hInstance", I_J);
 	CHOOSECOLORFc.rgbResult = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "rgbResult", "I");
-	CHOOSECOLORFc.lpCustColors = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lpCustColors", "I");
+	CHOOSECOLORFc.lpCustColors = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lpCustColors", I_J);
 	CHOOSECOLORFc.Flags = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "Flags", "I");
-	CHOOSECOLORFc.lCustData = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lCustData", "I");
-	CHOOSECOLORFc.lpfnHook = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lpfnHook", "I");
-	CHOOSECOLORFc.lpTemplateName = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lpTemplateName", "I");
+	CHOOSECOLORFc.lCustData = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lCustData", I_J);
+	CHOOSECOLORFc.lpfnHook = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lpfnHook", I_J);
+	CHOOSECOLORFc.lpTemplateName = (*env)->GetFieldID(env, CHOOSECOLORFc.clazz, "lpTemplateName", I_J);
 	CHOOSECOLORFc.cached = 1;
 }
 
@@ -473,14 +473,14 @@ CHOOSECOLOR *getCHOOSECOLORFields(JNIEnv *env, jobject lpObject, CHOOSECOLOR *lp
 {
 	if (!CHOOSECOLORFc.cached) cacheCHOOSECOLORFields(env, lpObject);
 	lpStruct->lStructSize = (*env)->GetIntField(env, lpObject, CHOOSECOLORFc.lStructSize);
-	lpStruct->hwndOwner = (HWND)(*env)->GetIntField(env, lpObject, CHOOSECOLORFc.hwndOwner);
-	lpStruct->hInstance = (HANDLE)(*env)->GetIntField(env, lpObject, CHOOSECOLORFc.hInstance);
+	lpStruct->hwndOwner = (HWND)(*env)->GetIntLongField(env, lpObject, CHOOSECOLORFc.hwndOwner);
+	lpStruct->hInstance = (HANDLE)(*env)->GetIntLongField(env, lpObject, CHOOSECOLORFc.hInstance);
 	lpStruct->rgbResult = (*env)->GetIntField(env, lpObject, CHOOSECOLORFc.rgbResult);
-	lpStruct->lpCustColors = (COLORREF *)(*env)->GetIntField(env, lpObject, CHOOSECOLORFc.lpCustColors);
+	lpStruct->lpCustColors = (COLORREF *)(*env)->GetIntLongField(env, lpObject, CHOOSECOLORFc.lpCustColors);
 	lpStruct->Flags = (*env)->GetIntField(env, lpObject, CHOOSECOLORFc.Flags);
-	lpStruct->lCustData = (*env)->GetIntField(env, lpObject, CHOOSECOLORFc.lCustData);
-	lpStruct->lpfnHook = (LPCCHOOKPROC)(*env)->GetIntField(env, lpObject, CHOOSECOLORFc.lpfnHook);
-	lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetIntField(env, lpObject, CHOOSECOLORFc.lpTemplateName);
+	lpStruct->lCustData = (*env)->GetIntLongField(env, lpObject, CHOOSECOLORFc.lCustData);
+	lpStruct->lpfnHook = (LPCCHOOKPROC)(*env)->GetIntLongField(env, lpObject, CHOOSECOLORFc.lpfnHook);
+	lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, CHOOSECOLORFc.lpTemplateName);
 	return lpStruct;
 }
 
@@ -488,14 +488,14 @@ void setCHOOSECOLORFields(JNIEnv *env, jobject lpObject, CHOOSECOLOR *lpStruct)
 {
 	if (!CHOOSECOLORFc.cached) cacheCHOOSECOLORFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, CHOOSECOLORFc.lStructSize, (jint)lpStruct->lStructSize);
-	(*env)->SetIntField(env, lpObject, CHOOSECOLORFc.hwndOwner, (jint)lpStruct->hwndOwner);
-	(*env)->SetIntField(env, lpObject, CHOOSECOLORFc.hInstance, (jint)lpStruct->hInstance);
+	(*env)->SetIntLongField(env, lpObject, CHOOSECOLORFc.hwndOwner, (jintLong)lpStruct->hwndOwner);
+	(*env)->SetIntLongField(env, lpObject, CHOOSECOLORFc.hInstance, (jintLong)lpStruct->hInstance);
 	(*env)->SetIntField(env, lpObject, CHOOSECOLORFc.rgbResult, (jint)lpStruct->rgbResult);
-	(*env)->SetIntField(env, lpObject, CHOOSECOLORFc.lpCustColors, (jint)lpStruct->lpCustColors);
+	(*env)->SetIntLongField(env, lpObject, CHOOSECOLORFc.lpCustColors, (jintLong)lpStruct->lpCustColors);
 	(*env)->SetIntField(env, lpObject, CHOOSECOLORFc.Flags, (jint)lpStruct->Flags);
-	(*env)->SetIntField(env, lpObject, CHOOSECOLORFc.lCustData, (jint)lpStruct->lCustData);
-	(*env)->SetIntField(env, lpObject, CHOOSECOLORFc.lpfnHook, (jint)lpStruct->lpfnHook);
-	(*env)->SetIntField(env, lpObject, CHOOSECOLORFc.lpTemplateName, (jint)lpStruct->lpTemplateName);
+	(*env)->SetIntLongField(env, lpObject, CHOOSECOLORFc.lCustData, (jintLong)lpStruct->lCustData);
+	(*env)->SetIntLongField(env, lpObject, CHOOSECOLORFc.lpfnHook, (jintLong)lpStruct->lpfnHook);
+	(*env)->SetIntLongField(env, lpObject, CHOOSECOLORFc.lpTemplateName, (jintLong)lpStruct->lpTemplateName);
 }
 #endif
 
@@ -513,17 +513,17 @@ void cacheCHOOSEFONTFields(JNIEnv *env, jobject lpObject)
 	if (CHOOSEFONTFc.cached) return;
 	CHOOSEFONTFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	CHOOSEFONTFc.lStructSize = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lStructSize", "I");
-	CHOOSEFONTFc.hwndOwner = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "hwndOwner", "I");
-	CHOOSEFONTFc.hDC = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "hDC", "I");
-	CHOOSEFONTFc.lpLogFont = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpLogFont", "I");
+	CHOOSEFONTFc.hwndOwner = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "hwndOwner", I_J);
+	CHOOSEFONTFc.hDC = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "hDC", I_J);
+	CHOOSEFONTFc.lpLogFont = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpLogFont", I_J);
 	CHOOSEFONTFc.iPointSize = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "iPointSize", "I");
 	CHOOSEFONTFc.Flags = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "Flags", "I");
 	CHOOSEFONTFc.rgbColors = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "rgbColors", "I");
-	CHOOSEFONTFc.lCustData = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lCustData", "I");
-	CHOOSEFONTFc.lpfnHook = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpfnHook", "I");
-	CHOOSEFONTFc.lpTemplateName = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpTemplateName", "I");
-	CHOOSEFONTFc.hInstance = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "hInstance", "I");
-	CHOOSEFONTFc.lpszStyle = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpszStyle", "I");
+	CHOOSEFONTFc.lCustData = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lCustData", I_J);
+	CHOOSEFONTFc.lpfnHook = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpfnHook", I_J);
+	CHOOSEFONTFc.lpTemplateName = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpTemplateName", I_J);
+	CHOOSEFONTFc.hInstance = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "hInstance", I_J);
+	CHOOSEFONTFc.lpszStyle = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "lpszStyle", I_J);
 	CHOOSEFONTFc.nFontType = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "nFontType", "S");
 	CHOOSEFONTFc.nSizeMin = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "nSizeMin", "I");
 	CHOOSEFONTFc.nSizeMax = (*env)->GetFieldID(env, CHOOSEFONTFc.clazz, "nSizeMax", "I");
@@ -534,17 +534,17 @@ CHOOSEFONT *getCHOOSEFONTFields(JNIEnv *env, jobject lpObject, CHOOSEFONT *lpStr
 {
 	if (!CHOOSEFONTFc.cached) cacheCHOOSEFONTFields(env, lpObject);
 	lpStruct->lStructSize = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.lStructSize);
-	lpStruct->hwndOwner = (HWND)(*env)->GetIntField(env, lpObject, CHOOSEFONTFc.hwndOwner);
-	lpStruct->hDC = (HDC)(*env)->GetIntField(env, lpObject, CHOOSEFONTFc.hDC);
-	lpStruct->lpLogFont = (LPLOGFONT)(*env)->GetIntField(env, lpObject, CHOOSEFONTFc.lpLogFont);
+	lpStruct->hwndOwner = (HWND)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.hwndOwner);
+	lpStruct->hDC = (HDC)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.hDC);
+	lpStruct->lpLogFont = (LPLOGFONT)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.lpLogFont);
 	lpStruct->iPointSize = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.iPointSize);
 	lpStruct->Flags = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.Flags);
 	lpStruct->rgbColors = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.rgbColors);
-	lpStruct->lCustData = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.lCustData);
-	lpStruct->lpfnHook = (LPCFHOOKPROC)(*env)->GetIntField(env, lpObject, CHOOSEFONTFc.lpfnHook);
-	lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetIntField(env, lpObject, CHOOSEFONTFc.lpTemplateName);
-	lpStruct->hInstance = (HINSTANCE)(*env)->GetIntField(env, lpObject, CHOOSEFONTFc.hInstance);
-	lpStruct->lpszStyle = (LPTSTR)(*env)->GetIntField(env, lpObject, CHOOSEFONTFc.lpszStyle);
+	lpStruct->lCustData = (*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.lCustData);
+	lpStruct->lpfnHook = (LPCFHOOKPROC)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.lpfnHook);
+	lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.lpTemplateName);
+	lpStruct->hInstance = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.hInstance);
+	lpStruct->lpszStyle = (LPTSTR)(*env)->GetIntLongField(env, lpObject, CHOOSEFONTFc.lpszStyle);
 	lpStruct->nFontType = (*env)->GetShortField(env, lpObject, CHOOSEFONTFc.nFontType);
 	lpStruct->nSizeMin = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.nSizeMin);
 	lpStruct->nSizeMax = (*env)->GetIntField(env, lpObject, CHOOSEFONTFc.nSizeMax);
@@ -555,17 +555,17 @@ void setCHOOSEFONTFields(JNIEnv *env, jobject lpObject, CHOOSEFONT *lpStruct)
 {
 	if (!CHOOSEFONTFc.cached) cacheCHOOSEFONTFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.lStructSize, (jint)lpStruct->lStructSize);
-	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.hwndOwner, (jint)lpStruct->hwndOwner);
-	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.hDC, (jint)lpStruct->hDC);
-	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.lpLogFont, (jint)lpStruct->lpLogFont);
+	(*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.hwndOwner, (jintLong)lpStruct->hwndOwner);
+	(*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.hDC, (jintLong)lpStruct->hDC);
+	(*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.lpLogFont, (jintLong)lpStruct->lpLogFont);
 	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.iPointSize, (jint)lpStruct->iPointSize);
 	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.Flags, (jint)lpStruct->Flags);
 	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.rgbColors, (jint)lpStruct->rgbColors);
-	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.lCustData, (jint)lpStruct->lCustData);
-	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.lpfnHook, (jint)lpStruct->lpfnHook);
-	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.lpTemplateName, (jint)lpStruct->lpTemplateName);
-	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.hInstance, (jint)lpStruct->hInstance);
-	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.lpszStyle, (jint)lpStruct->lpszStyle);
+	(*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.lCustData, (jintLong)lpStruct->lCustData);
+	(*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.lpfnHook, (jintLong)lpStruct->lpfnHook);
+	(*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.lpTemplateName, (jintLong)lpStruct->lpTemplateName);
+	(*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.hInstance, (jintLong)lpStruct->hInstance);
+	(*env)->SetIntLongField(env, lpObject, CHOOSEFONTFc.lpszStyle, (jintLong)lpStruct->lpszStyle);
 	(*env)->SetShortField(env, lpObject, CHOOSEFONTFc.nFontType, (jshort)lpStruct->nFontType);
 	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.nSizeMin, (jint)lpStruct->nSizeMin);
 	(*env)->SetIntField(env, lpObject, CHOOSEFONTFc.nSizeMax, (jint)lpStruct->nSizeMax);
@@ -595,9 +595,9 @@ void cacheCOMBOBOXINFOFields(JNIEnv *env, jobject lpObject)
 	COMBOBOXINFOFc.buttonRight = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "buttonRight", "I");
 	COMBOBOXINFOFc.buttonBottom = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "buttonBottom", "I");
 	COMBOBOXINFOFc.stateButton = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "stateButton", "I");
-	COMBOBOXINFOFc.hwndCombo = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "hwndCombo", "I");
-	COMBOBOXINFOFc.hwndItem = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "hwndItem", "I");
-	COMBOBOXINFOFc.hwndList = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "hwndList", "I");
+	COMBOBOXINFOFc.hwndCombo = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "hwndCombo", I_J);
+	COMBOBOXINFOFc.hwndItem = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "hwndItem", I_J);
+	COMBOBOXINFOFc.hwndList = (*env)->GetFieldID(env, COMBOBOXINFOFc.clazz, "hwndList", I_J);
 	COMBOBOXINFOFc.cached = 1;
 }
 
@@ -614,9 +614,9 @@ COMBOBOXINFO *getCOMBOBOXINFOFields(JNIEnv *env, jobject lpObject, COMBOBOXINFO
 	lpStruct->rcButton.right = (*env)->GetIntField(env, lpObject, COMBOBOXINFOFc.buttonRight);
 	lpStruct->rcButton.bottom = (*env)->GetIntField(env, lpObject, COMBOBOXINFOFc.buttonBottom);
 	lpStruct->stateButton = (*env)->GetIntField(env, lpObject, COMBOBOXINFOFc.stateButton);
-	lpStruct->hwndCombo = (HWND)(*env)->GetIntField(env, lpObject, COMBOBOXINFOFc.hwndCombo);
-	lpStruct->hwndItem = (HWND)(*env)->GetIntField(env, lpObject, COMBOBOXINFOFc.hwndItem);
-	lpStruct->hwndList = (HWND)(*env)->GetIntField(env, lpObject, COMBOBOXINFOFc.hwndList);
+	lpStruct->hwndCombo = (HWND)(*env)->GetIntLongField(env, lpObject, COMBOBOXINFOFc.hwndCombo);
+	lpStruct->hwndItem = (HWND)(*env)->GetIntLongField(env, lpObject, COMBOBOXINFOFc.hwndItem);
+	lpStruct->hwndList = (HWND)(*env)->GetIntLongField(env, lpObject, COMBOBOXINFOFc.hwndList);
 	return lpStruct;
 }
 
@@ -633,9 +633,9 @@ void setCOMBOBOXINFOFields(JNIEnv *env, jobject lpObject, COMBOBOXINFO *lpStruct
 	(*env)->SetIntField(env, lpObject, COMBOBOXINFOFc.buttonRight, (jint)lpStruct->rcButton.right);
 	(*env)->SetIntField(env, lpObject, COMBOBOXINFOFc.buttonBottom, (jint)lpStruct->rcButton.bottom);
 	(*env)->SetIntField(env, lpObject, COMBOBOXINFOFc.stateButton, (jint)lpStruct->stateButton);
-	(*env)->SetIntField(env, lpObject, COMBOBOXINFOFc.hwndCombo, (jint)lpStruct->hwndCombo);
-	(*env)->SetIntField(env, lpObject, COMBOBOXINFOFc.hwndItem, (jint)lpStruct->hwndItem);
-	(*env)->SetIntField(env, lpObject, COMBOBOXINFOFc.hwndList, (jint)lpStruct->hwndList);
+	(*env)->SetIntLongField(env, lpObject, COMBOBOXINFOFc.hwndCombo, (jintLong)lpStruct->hwndCombo);
+	(*env)->SetIntLongField(env, lpObject, COMBOBOXINFOFc.hwndItem, (jintLong)lpStruct->hwndItem);
+	(*env)->SetIntLongField(env, lpObject, COMBOBOXINFOFc.hwndList, (jintLong)lpStruct->hwndList);
 }
 #endif
 
@@ -701,17 +701,17 @@ void cacheCREATESTRUCTFields(JNIEnv *env, jobject lpObject)
 {
 	if (CREATESTRUCTFc.cached) return;
 	CREATESTRUCTFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CREATESTRUCTFc.lpCreateParams = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "lpCreateParams", "I");
-	CREATESTRUCTFc.hInstance = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "hInstance", "I");
-	CREATESTRUCTFc.hMenu = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "hMenu", "I");
-	CREATESTRUCTFc.hwndParent = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "hwndParent", "I");
+	CREATESTRUCTFc.lpCreateParams = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "lpCreateParams", I_J);
+	CREATESTRUCTFc.hInstance = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "hInstance", I_J);
+	CREATESTRUCTFc.hMenu = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "hMenu", I_J);
+	CREATESTRUCTFc.hwndParent = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "hwndParent", I_J);
 	CREATESTRUCTFc.cy = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "cy", "I");
 	CREATESTRUCTFc.cx = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "cx", "I");
 	CREATESTRUCTFc.y = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "y", "I");
 	CREATESTRUCTFc.x = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "x", "I");
 	CREATESTRUCTFc.style = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "style", "I");
-	CREATESTRUCTFc.lpszName = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "lpszName", "I");
-	CREATESTRUCTFc.lpszClass = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "lpszClass", "I");
+	CREATESTRUCTFc.lpszName = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "lpszName", I_J);
+	CREATESTRUCTFc.lpszClass = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "lpszClass", I_J);
 	CREATESTRUCTFc.dwExStyle = (*env)->GetFieldID(env, CREATESTRUCTFc.clazz, "dwExStyle", "I");
 	CREATESTRUCTFc.cached = 1;
 }
@@ -719,17 +719,17 @@ void cacheCREATESTRUCTFields(JNIEnv *env, jobject lpObject)
 CREATESTRUCT *getCREATESTRUCTFields(JNIEnv *env, jobject lpObject, CREATESTRUCT *lpStruct)
 {
 	if (!CREATESTRUCTFc.cached) cacheCREATESTRUCTFields(env, lpObject);
-	lpStruct->lpCreateParams = (LPVOID)(*env)->GetIntField(env, lpObject, CREATESTRUCTFc.lpCreateParams);
-	lpStruct->hInstance = (HINSTANCE)(*env)->GetIntField(env, lpObject, CREATESTRUCTFc.hInstance);
-	lpStruct->hMenu = (HMENU)(*env)->GetIntField(env, lpObject, CREATESTRUCTFc.hMenu);
-	lpStruct->hwndParent = (HWND)(*env)->GetIntField(env, lpObject, CREATESTRUCTFc.hwndParent);
+	lpStruct->lpCreateParams = (LPVOID)(*env)->GetIntLongField(env, lpObject, CREATESTRUCTFc.lpCreateParams);
+	lpStruct->hInstance = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, CREATESTRUCTFc.hInstance);
+	lpStruct->hMenu = (HMENU)(*env)->GetIntLongField(env, lpObject, CREATESTRUCTFc.hMenu);
+	lpStruct->hwndParent = (HWND)(*env)->GetIntLongField(env, lpObject, CREATESTRUCTFc.hwndParent);
 	lpStruct->cy = (*env)->GetIntField(env, lpObject, CREATESTRUCTFc.cy);
 	lpStruct->cx = (*env)->GetIntField(env, lpObject, CREATESTRUCTFc.cx);
 	lpStruct->y = (*env)->GetIntField(env, lpObject, CREATESTRUCTFc.y);
 	lpStruct->x = (*env)->GetIntField(env, lpObject, CREATESTRUCTFc.x);
 	lpStruct->style = (*env)->GetIntField(env, lpObject, CREATESTRUCTFc.style);
-	lpStruct->lpszName = (LPCTSTR)(*env)->GetIntField(env, lpObject, CREATESTRUCTFc.lpszName);
-	lpStruct->lpszClass = (LPCTSTR)(*env)->GetIntField(env, lpObject, CREATESTRUCTFc.lpszClass);
+	lpStruct->lpszName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, CREATESTRUCTFc.lpszName);
+	lpStruct->lpszClass = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, CREATESTRUCTFc.lpszClass);
 	lpStruct->dwExStyle = (*env)->GetIntField(env, lpObject, CREATESTRUCTFc.dwExStyle);
 	return lpStruct;
 }
@@ -737,17 +737,17 @@ CREATESTRUCT *getCREATESTRUCTFields(JNIEnv *env, jobject lpObject, CREATESTRUCT
 void setCREATESTRUCTFields(JNIEnv *env, jobject lpObject, CREATESTRUCT *lpStruct)
 {
 	if (!CREATESTRUCTFc.cached) cacheCREATESTRUCTFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, CREATESTRUCTFc.lpCreateParams, (jint)lpStruct->lpCreateParams);
-	(*env)->SetIntField(env, lpObject, CREATESTRUCTFc.hInstance, (jint)lpStruct->hInstance);
-	(*env)->SetIntField(env, lpObject, CREATESTRUCTFc.hMenu, (jint)lpStruct->hMenu);
-	(*env)->SetIntField(env, lpObject, CREATESTRUCTFc.hwndParent, (jint)lpStruct->hwndParent);
+	(*env)->SetIntLongField(env, lpObject, CREATESTRUCTFc.lpCreateParams, (jintLong)lpStruct->lpCreateParams);
+	(*env)->SetIntLongField(env, lpObject, CREATESTRUCTFc.hInstance, (jintLong)lpStruct->hInstance);
+	(*env)->SetIntLongField(env, lpObject, CREATESTRUCTFc.hMenu, (jintLong)lpStruct->hMenu);
+	(*env)->SetIntLongField(env, lpObject, CREATESTRUCTFc.hwndParent, (jintLong)lpStruct->hwndParent);
 	(*env)->SetIntField(env, lpObject, CREATESTRUCTFc.cy, (jint)lpStruct->cy);
 	(*env)->SetIntField(env, lpObject, CREATESTRUCTFc.cx, (jint)lpStruct->cx);
 	(*env)->SetIntField(env, lpObject, CREATESTRUCTFc.y, (jint)lpStruct->y);
 	(*env)->SetIntField(env, lpObject, CREATESTRUCTFc.x, (jint)lpStruct->x);
 	(*env)->SetIntField(env, lpObject, CREATESTRUCTFc.style, (jint)lpStruct->style);
-	(*env)->SetIntField(env, lpObject, CREATESTRUCTFc.lpszName, (jint)lpStruct->lpszName);
-	(*env)->SetIntField(env, lpObject, CREATESTRUCTFc.lpszClass, (jint)lpStruct->lpszClass);
+	(*env)->SetIntLongField(env, lpObject, CREATESTRUCTFc.lpszName, (jintLong)lpStruct->lpszName);
+	(*env)->SetIntLongField(env, lpObject, CREATESTRUCTFc.lpszClass, (jintLong)lpStruct->lpszClass);
 	(*env)->SetIntField(env, lpObject, CREATESTRUCTFc.dwExStyle, (jint)lpStruct->dwExStyle);
 }
 #endif
@@ -780,7 +780,7 @@ void cacheDIBSECTIONFields(JNIEnv *env, jobject lpObject)
 	DIBSECTIONFc.dsBitfields0 = (*env)->GetFieldID(env, DIBSECTIONFc.clazz, "dsBitfields0", "I");
 	DIBSECTIONFc.dsBitfields1 = (*env)->GetFieldID(env, DIBSECTIONFc.clazz, "dsBitfields1", "I");
 	DIBSECTIONFc.dsBitfields2 = (*env)->GetFieldID(env, DIBSECTIONFc.clazz, "dsBitfields2", "I");
-	DIBSECTIONFc.dshSection = (*env)->GetFieldID(env, DIBSECTIONFc.clazz, "dshSection", "I");
+	DIBSECTIONFc.dshSection = (*env)->GetFieldID(env, DIBSECTIONFc.clazz, "dshSection", I_J);
 	DIBSECTIONFc.dsOffset = (*env)->GetFieldID(env, DIBSECTIONFc.clazz, "dsOffset", "I");
 	DIBSECTIONFc.cached = 1;
 }
@@ -803,7 +803,7 @@ DIBSECTION *getDIBSECTIONFields(JNIEnv *env, jobject lpObject, DIBSECTION *lpStr
 	lpStruct->dsBitfields[0] = (*env)->GetIntField(env, lpObject, DIBSECTIONFc.dsBitfields0);
 	lpStruct->dsBitfields[1] = (*env)->GetIntField(env, lpObject, DIBSECTIONFc.dsBitfields1);
 	lpStruct->dsBitfields[2] = (*env)->GetIntField(env, lpObject, DIBSECTIONFc.dsBitfields2);
-	lpStruct->dshSection = (HANDLE)(*env)->GetIntField(env, lpObject, DIBSECTIONFc.dshSection);
+	lpStruct->dshSection = (HANDLE)(*env)->GetIntLongField(env, lpObject, DIBSECTIONFc.dshSection);
 	lpStruct->dsOffset = (*env)->GetIntField(env, lpObject, DIBSECTIONFc.dsOffset);
 	return lpStruct;
 }
@@ -826,7 +826,7 @@ void setDIBSECTIONFields(JNIEnv *env, jobject lpObject, DIBSECTION *lpStruct)
 	(*env)->SetIntField(env, lpObject, DIBSECTIONFc.dsBitfields0, (jint)lpStruct->dsBitfields[0]);
 	(*env)->SetIntField(env, lpObject, DIBSECTIONFc.dsBitfields1, (jint)lpStruct->dsBitfields[1]);
 	(*env)->SetIntField(env, lpObject, DIBSECTIONFc.dsBitfields2, (jint)lpStruct->dsBitfields[2]);
-	(*env)->SetIntField(env, lpObject, DIBSECTIONFc.dshSection, (jint)lpStruct->dshSection);
+	(*env)->SetIntLongField(env, lpObject, DIBSECTIONFc.dshSection, (jintLong)lpStruct->dshSection);
 	(*env)->SetIntField(env, lpObject, DIBSECTIONFc.dsOffset, (jint)lpStruct->dsOffset);
 }
 #endif
@@ -925,9 +925,9 @@ void cacheDOCINFOFields(JNIEnv *env, jobject lpObject)
 	if (DOCINFOFc.cached) return;
 	DOCINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	DOCINFOFc.cbSize = (*env)->GetFieldID(env, DOCINFOFc.clazz, "cbSize", "I");
-	DOCINFOFc.lpszDocName = (*env)->GetFieldID(env, DOCINFOFc.clazz, "lpszDocName", "I");
-	DOCINFOFc.lpszOutput = (*env)->GetFieldID(env, DOCINFOFc.clazz, "lpszOutput", "I");
-	DOCINFOFc.lpszDatatype = (*env)->GetFieldID(env, DOCINFOFc.clazz, "lpszDatatype", "I");
+	DOCINFOFc.lpszDocName = (*env)->GetFieldID(env, DOCINFOFc.clazz, "lpszDocName", I_J);
+	DOCINFOFc.lpszOutput = (*env)->GetFieldID(env, DOCINFOFc.clazz, "lpszOutput", I_J);
+	DOCINFOFc.lpszDatatype = (*env)->GetFieldID(env, DOCINFOFc.clazz, "lpszDatatype", I_J);
 	DOCINFOFc.fwType = (*env)->GetFieldID(env, DOCINFOFc.clazz, "fwType", "I");
 	DOCINFOFc.cached = 1;
 }
@@ -936,9 +936,9 @@ DOCINFO *getDOCINFOFields(JNIEnv *env, jobject lpObject, DOCINFO *lpStruct)
 {
 	if (!DOCINFOFc.cached) cacheDOCINFOFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, DOCINFOFc.cbSize);
-	lpStruct->lpszDocName = (LPCTSTR)(*env)->GetIntField(env, lpObject, DOCINFOFc.lpszDocName);
-	lpStruct->lpszOutput = (LPCTSTR)(*env)->GetIntField(env, lpObject, DOCINFOFc.lpszOutput);
-	lpStruct->lpszDatatype = (LPCTSTR)(*env)->GetIntField(env, lpObject, DOCINFOFc.lpszDatatype);
+	lpStruct->lpszDocName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, DOCINFOFc.lpszDocName);
+	lpStruct->lpszOutput = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, DOCINFOFc.lpszOutput);
+	lpStruct->lpszDatatype = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, DOCINFOFc.lpszDatatype);
 	lpStruct->fwType = (*env)->GetIntField(env, lpObject, DOCINFOFc.fwType);
 	return lpStruct;
 }
@@ -947,9 +947,9 @@ void setDOCINFOFields(JNIEnv *env, jobject lpObject, DOCINFO *lpStruct)
 {
 	if (!DOCINFOFc.cached) cacheDOCINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, DOCINFOFc.cbSize, (jint)lpStruct->cbSize);
-	(*env)->SetIntField(env, lpObject, DOCINFOFc.lpszDocName, (jint)lpStruct->lpszDocName);
-	(*env)->SetIntField(env, lpObject, DOCINFOFc.lpszOutput, (jint)lpStruct->lpszOutput);
-	(*env)->SetIntField(env, lpObject, DOCINFOFc.lpszDatatype, (jint)lpStruct->lpszDatatype);
+	(*env)->SetIntLongField(env, lpObject, DOCINFOFc.lpszDocName, (jintLong)lpStruct->lpszDocName);
+	(*env)->SetIntLongField(env, lpObject, DOCINFOFc.lpszOutput, (jintLong)lpStruct->lpszOutput);
+	(*env)->SetIntLongField(env, lpObject, DOCINFOFc.lpszDatatype, (jintLong)lpStruct->lpszDatatype);
 	(*env)->SetIntField(env, lpObject, DOCINFOFc.fwType, (jint)lpStruct->fwType);
 }
 #endif
@@ -972,13 +972,13 @@ void cacheDRAWITEMSTRUCTFields(JNIEnv *env, jobject lpObject)
 	DRAWITEMSTRUCTFc.itemID = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "itemID", "I");
 	DRAWITEMSTRUCTFc.itemAction = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "itemAction", "I");
 	DRAWITEMSTRUCTFc.itemState = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "itemState", "I");
-	DRAWITEMSTRUCTFc.hwndItem = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "hwndItem", "I");
-	DRAWITEMSTRUCTFc.hDC = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "hDC", "I");
+	DRAWITEMSTRUCTFc.hwndItem = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "hwndItem", I_J);
+	DRAWITEMSTRUCTFc.hDC = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "hDC", I_J);
 	DRAWITEMSTRUCTFc.left = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "left", "I");
 	DRAWITEMSTRUCTFc.top = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "top", "I");
 	DRAWITEMSTRUCTFc.bottom = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "bottom", "I");
 	DRAWITEMSTRUCTFc.right = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "right", "I");
-	DRAWITEMSTRUCTFc.itemData = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "itemData", "I");
+	DRAWITEMSTRUCTFc.itemData = (*env)->GetFieldID(env, DRAWITEMSTRUCTFc.clazz, "itemData", I_J);
 	DRAWITEMSTRUCTFc.cached = 1;
 }
 
@@ -990,13 +990,13 @@ DRAWITEMSTRUCT *getDRAWITEMSTRUCTFields(JNIEnv *env, jobject lpObject, DRAWITEMS
 	lpStruct->itemID = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemID);
 	lpStruct->itemAction = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemAction);
 	lpStruct->itemState = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemState);
-	lpStruct->hwndItem = (HWND)(*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.hwndItem);
-	lpStruct->hDC = (HDC)(*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.hDC);
+	lpStruct->hwndItem = (HWND)(*env)->GetIntLongField(env, lpObject, DRAWITEMSTRUCTFc.hwndItem);
+	lpStruct->hDC = (HDC)(*env)->GetIntLongField(env, lpObject, DRAWITEMSTRUCTFc.hDC);
 	lpStruct->rcItem.left = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.left);
 	lpStruct->rcItem.top = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.top);
 	lpStruct->rcItem.bottom = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.bottom);
 	lpStruct->rcItem.right = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.right);
-	lpStruct->itemData = (*env)->GetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemData);
+	lpStruct->itemData = (*env)->GetIntLongField(env, lpObject, DRAWITEMSTRUCTFc.itemData);
 	return lpStruct;
 }
 
@@ -1008,13 +1008,13 @@ void setDRAWITEMSTRUCTFields(JNIEnv *env, jobject lpObject, DRAWITEMSTRUCT *lpSt
 	(*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemID, (jint)lpStruct->itemID);
 	(*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemAction, (jint)lpStruct->itemAction);
 	(*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemState, (jint)lpStruct->itemState);
-	(*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.hwndItem, (jint)lpStruct->hwndItem);
-	(*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.hDC, (jint)lpStruct->hDC);
+	(*env)->SetIntLongField(env, lpObject, DRAWITEMSTRUCTFc.hwndItem, (jintLong)lpStruct->hwndItem);
+	(*env)->SetIntLongField(env, lpObject, DRAWITEMSTRUCTFc.hDC, (jintLong)lpStruct->hDC);
 	(*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.left, (jint)lpStruct->rcItem.left);
 	(*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.top, (jint)lpStruct->rcItem.top);
 	(*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.bottom, (jint)lpStruct->rcItem.bottom);
 	(*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.right, (jint)lpStruct->rcItem.right);
-	(*env)->SetIntField(env, lpObject, DRAWITEMSTRUCTFc.itemData, (jint)lpStruct->itemData);
+	(*env)->SetIntLongField(env, lpObject, DRAWITEMSTRUCTFc.itemData, (jintLong)lpStruct->itemData);
 }
 #endif
 
@@ -1076,7 +1076,7 @@ void cacheDWM_BLURBEHINDFields(JNIEnv *env, jobject lpObject)
 	DWM_BLURBEHINDFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	DWM_BLURBEHINDFc.dwFlags = (*env)->GetFieldID(env, DWM_BLURBEHINDFc.clazz, "dwFlags", "I");
 	DWM_BLURBEHINDFc.fEnable = (*env)->GetFieldID(env, DWM_BLURBEHINDFc.clazz, "fEnable", "Z");
-	DWM_BLURBEHINDFc.hRgnBlur = (*env)->GetFieldID(env, DWM_BLURBEHINDFc.clazz, "hRgnBlur", "I");
+	DWM_BLURBEHINDFc.hRgnBlur = (*env)->GetFieldID(env, DWM_BLURBEHINDFc.clazz, "hRgnBlur", I_J);
 	DWM_BLURBEHINDFc.fTransitionOnMaximized = (*env)->GetFieldID(env, DWM_BLURBEHINDFc.clazz, "fTransitionOnMaximized", "Z");
 	DWM_BLURBEHINDFc.cached = 1;
 }
@@ -1086,7 +1086,7 @@ DWM_BLURBEHIND *getDWM_BLURBEHINDFields(JNIEnv *env, jobject lpObject, DWM_BLURB
 	if (!DWM_BLURBEHINDFc.cached) cacheDWM_BLURBEHINDFields(env, lpObject);
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, DWM_BLURBEHINDFc.dwFlags);
 	lpStruct->fEnable = (*env)->GetBooleanField(env, lpObject, DWM_BLURBEHINDFc.fEnable);
-	lpStruct->hRgnBlur = (HRGN)(*env)->GetIntField(env, lpObject, DWM_BLURBEHINDFc.hRgnBlur);
+	lpStruct->hRgnBlur = (HRGN)(*env)->GetIntLongField(env, lpObject, DWM_BLURBEHINDFc.hRgnBlur);
 	lpStruct->fTransitionOnMaximized = (*env)->GetBooleanField(env, lpObject, DWM_BLURBEHINDFc.fTransitionOnMaximized);
 	return lpStruct;
 }
@@ -1096,7 +1096,7 @@ void setDWM_BLURBEHINDFields(JNIEnv *env, jobject lpObject, DWM_BLURBEHIND *lpSt
 	if (!DWM_BLURBEHINDFc.cached) cacheDWM_BLURBEHINDFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, DWM_BLURBEHINDFc.dwFlags, (jint)lpStruct->dwFlags);
 	(*env)->SetBooleanField(env, lpObject, DWM_BLURBEHINDFc.fEnable, (jboolean)lpStruct->fEnable);
-	(*env)->SetIntField(env, lpObject, DWM_BLURBEHINDFc.hRgnBlur, (jint)lpStruct->hRgnBlur);
+	(*env)->SetIntLongField(env, lpObject, DWM_BLURBEHINDFc.hRgnBlur, (jintLong)lpStruct->hRgnBlur);
 	(*env)->SetBooleanField(env, lpObject, DWM_BLURBEHINDFc.fTransitionOnMaximized, (jboolean)lpStruct->fTransitionOnMaximized);
 }
 #endif
@@ -1219,11 +1219,11 @@ EXTLOGFONTW *getEXTLOGFONTWFields(JNIEnv *env, jobject lpObject, EXTLOGFONTW *lp
 	}
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfFullName);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfFullName) / 2, (jchar *)lpStruct->elfFullName);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfFullName) / sizeof(jchar), (jchar *)lpStruct->elfFullName);
 	}
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfStyle);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfStyle) / 2, (jchar *)lpStruct->elfStyle);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfStyle) / sizeof(jchar), (jchar *)lpStruct->elfStyle);
 	}
 	lpStruct->elfVersion = (*env)->GetIntField(env, lpObject, EXTLOGFONTWFc.elfVersion);
 	lpStruct->elfStyleSize = (*env)->GetIntField(env, lpObject, EXTLOGFONTWFc.elfStyleSize);
@@ -1250,11 +1250,11 @@ void setEXTLOGFONTWFields(JNIEnv *env, jobject lpObject, EXTLOGFONTW *lpStruct)
 	}
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfFullName);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfFullName) / 2, (jchar *)lpStruct->elfFullName);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfFullName) / sizeof(jchar), (jchar *)lpStruct->elfFullName);
 	}
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, EXTLOGFONTWFc.elfStyle);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfStyle) / 2, (jchar *)lpStruct->elfStyle);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elfStyle) / sizeof(jchar), (jchar *)lpStruct->elfStyle);
 	}
 	(*env)->SetIntField(env, lpObject, EXTLOGFONTWFc.elfVersion, (jint)lpStruct->elfVersion);
 	(*env)->SetIntField(env, lpObject, EXTLOGFONTWFc.elfStyleSize, (jint)lpStruct->elfStyleSize);
@@ -1289,7 +1289,7 @@ void cacheEXTLOGPENFields(JNIEnv *env, jobject lpObject)
 	EXTLOGPENFc.elpWidth = (*env)->GetFieldID(env, EXTLOGPENFc.clazz, "elpWidth", "I");
 	EXTLOGPENFc.elpBrushStyle = (*env)->GetFieldID(env, EXTLOGPENFc.clazz, "elpBrushStyle", "I");
 	EXTLOGPENFc.elpColor = (*env)->GetFieldID(env, EXTLOGPENFc.clazz, "elpColor", "I");
-	EXTLOGPENFc.elpHatch = (*env)->GetFieldID(env, EXTLOGPENFc.clazz, "elpHatch", "I");
+	EXTLOGPENFc.elpHatch = (*env)->GetFieldID(env, EXTLOGPENFc.clazz, "elpHatch", I_J);
 	EXTLOGPENFc.elpNumEntries = (*env)->GetFieldID(env, EXTLOGPENFc.clazz, "elpNumEntries", "I");
 	EXTLOGPENFc.elpStyleEntry = (*env)->GetFieldID(env, EXTLOGPENFc.clazz, "elpStyleEntry", "[I");
 	EXTLOGPENFc.cached = 1;
@@ -1302,11 +1302,11 @@ EXTLOGPEN *getEXTLOGPENFields(JNIEnv *env, jobject lpObject, EXTLOGPEN *lpStruct
 	lpStruct->elpWidth = (*env)->GetIntField(env, lpObject, EXTLOGPENFc.elpWidth);
 	lpStruct->elpBrushStyle = (*env)->GetIntField(env, lpObject, EXTLOGPENFc.elpBrushStyle);
 	lpStruct->elpColor = (*env)->GetIntField(env, lpObject, EXTLOGPENFc.elpColor);
-	lpStruct->elpHatch = (*env)->GetIntField(env, lpObject, EXTLOGPENFc.elpHatch);
+	lpStruct->elpHatch = (*env)->GetIntLongField(env, lpObject, EXTLOGPENFc.elpHatch);
 	lpStruct->elpNumEntries = (*env)->GetIntField(env, lpObject, EXTLOGPENFc.elpNumEntries);
 	{
 	jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, EXTLOGPENFc.elpStyleEntry);
-	(*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elpStyleEntry) / 4, (jint *)lpStruct->elpStyleEntry);
+	(*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elpStyleEntry) / sizeof(jint), (jint *)lpStruct->elpStyleEntry);
 	}
 	return lpStruct;
 }
@@ -1318,11 +1318,11 @@ void setEXTLOGPENFields(JNIEnv *env, jobject lpObject, EXTLOGPEN *lpStruct)
 	(*env)->SetIntField(env, lpObject, EXTLOGPENFc.elpWidth, (jint)lpStruct->elpWidth);
 	(*env)->SetIntField(env, lpObject, EXTLOGPENFc.elpBrushStyle, (jint)lpStruct->elpBrushStyle);
 	(*env)->SetIntField(env, lpObject, EXTLOGPENFc.elpColor, (jint)lpStruct->elpColor);
-	(*env)->SetIntField(env, lpObject, EXTLOGPENFc.elpHatch, (jint)lpStruct->elpHatch);
+	(*env)->SetIntLongField(env, lpObject, EXTLOGPENFc.elpHatch, (jintLong)lpStruct->elpHatch);
 	(*env)->SetIntField(env, lpObject, EXTLOGPENFc.elpNumEntries, (jint)lpStruct->elpNumEntries);
 	{
 	jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, EXTLOGPENFc.elpStyleEntry);
-	(*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elpStyleEntry) / 4, (jint *)lpStruct->elpStyleEntry);
+	(*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->elpStyleEntry) / sizeof(jint), (jint *)lpStruct->elpStyleEntry);
 	}
 }
 #endif
@@ -1375,12 +1375,12 @@ void cacheGCP_RESULTSFields(JNIEnv *env, jobject lpObject)
 	if (GCP_RESULTSFc.cached) return;
 	GCP_RESULTSFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	GCP_RESULTSFc.lStructSize = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lStructSize", "I");
-	GCP_RESULTSFc.lpOutString = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpOutString", "I");
-	GCP_RESULTSFc.lpOrder = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpOrder", "I");
-	GCP_RESULTSFc.lpDx = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpDx", "I");
-	GCP_RESULTSFc.lpCaretPos = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpCaretPos", "I");
-	GCP_RESULTSFc.lpClass = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpClass", "I");
-	GCP_RESULTSFc.lpGlyphs = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpGlyphs", "I");
+	GCP_RESULTSFc.lpOutString = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpOutString", I_J);
+	GCP_RESULTSFc.lpOrder = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpOrder", I_J);
+	GCP_RESULTSFc.lpDx = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpDx", I_J);
+	GCP_RESULTSFc.lpCaretPos = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpCaretPos", I_J);
+	GCP_RESULTSFc.lpClass = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpClass", I_J);
+	GCP_RESULTSFc.lpGlyphs = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "lpGlyphs", I_J);
 	GCP_RESULTSFc.nGlyphs = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "nGlyphs", "I");
 	GCP_RESULTSFc.nMaxFit = (*env)->GetFieldID(env, GCP_RESULTSFc.clazz, "nMaxFit", "I");
 	GCP_RESULTSFc.cached = 1;
@@ -1390,12 +1390,12 @@ GCP_RESULTS *getGCP_RESULTSFields(JNIEnv *env, jobject lpObject, GCP_RESULTS *lp
 {
 	if (!GCP_RESULTSFc.cached) cacheGCP_RESULTSFields(env, lpObject);
 	lpStruct->lStructSize = (*env)->GetIntField(env, lpObject, GCP_RESULTSFc.lStructSize);
-	lpStruct->lpOutString = (LPTSTR)(*env)->GetIntField(env, lpObject, GCP_RESULTSFc.lpOutString);
-	lpStruct->lpOrder = (UINT  *)(*env)->GetIntField(env, lpObject, GCP_RESULTSFc.lpOrder);
-	lpStruct->lpDx = (int  *)(*env)->GetIntField(env, lpObject, GCP_RESULTSFc.lpDx);
-	lpStruct->lpCaretPos = (int  *)(*env)->GetIntField(env, lpObject, GCP_RESULTSFc.lpCaretPos);
-	lpStruct->lpClass = (LPSTR)(*env)->GetIntField(env, lpObject, GCP_RESULTSFc.lpClass);
-	lpStruct->lpGlyphs = (LPWSTR)(*env)->GetIntField(env, lpObject, GCP_RESULTSFc.lpGlyphs);
+	lpStruct->lpOutString = (LPTSTR)(*env)->GetIntLongField(env, lpObject, GCP_RESULTSFc.lpOutString);
+	lpStruct->lpOrder = (UINT  *)(*env)->GetIntLongField(env, lpObject, GCP_RESULTSFc.lpOrder);
+	lpStruct->lpDx = (int  *)(*env)->GetIntLongField(env, lpObject, GCP_RESULTSFc.lpDx);
+	lpStruct->lpCaretPos = (int  *)(*env)->GetIntLongField(env, lpObject, GCP_RESULTSFc.lpCaretPos);
+	lpStruct->lpClass = (LPSTR)(*env)->GetIntLongField(env, lpObject, GCP_RESULTSFc.lpClass);
+	lpStruct->lpGlyphs = (LPWSTR)(*env)->GetIntLongField(env, lpObject, GCP_RESULTSFc.lpGlyphs);
 	lpStruct->nGlyphs = (*env)->GetIntField(env, lpObject, GCP_RESULTSFc.nGlyphs);
 	lpStruct->nMaxFit = (*env)->GetIntField(env, lpObject, GCP_RESULTSFc.nMaxFit);
 	return lpStruct;
@@ -1405,12 +1405,12 @@ void setGCP_RESULTSFields(JNIEnv *env, jobject lpObject, GCP_RESULTS *lpStruct)
 {
 	if (!GCP_RESULTSFc.cached) cacheGCP_RESULTSFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, GCP_RESULTSFc.lStructSize, (jint)lpStruct->lStructSize);
-	(*env)->SetIntField(env, lpObject, GCP_RESULTSFc.lpOutString, (jint)lpStruct->lpOutString);
-	(*env)->SetIntField(env, lpObject, GCP_RESULTSFc.lpOrder, (jint)lpStruct->lpOrder);
-	(*env)->SetIntField(env, lpObject, GCP_RESULTSFc.lpDx, (jint)lpStruct->lpDx);
-	(*env)->SetIntField(env, lpObject, GCP_RESULTSFc.lpCaretPos, (jint)lpStruct->lpCaretPos);
-	(*env)->SetIntField(env, lpObject, GCP_RESULTSFc.lpClass, (jint)lpStruct->lpClass);
-	(*env)->SetIntField(env, lpObject, GCP_RESULTSFc.lpGlyphs, (jint)lpStruct->lpGlyphs);
+	(*env)->SetIntLongField(env, lpObject, GCP_RESULTSFc.lpOutString, (jintLong)lpStruct->lpOutString);
+	(*env)->SetIntLongField(env, lpObject, GCP_RESULTSFc.lpOrder, (jintLong)lpStruct->lpOrder);
+	(*env)->SetIntLongField(env, lpObject, GCP_RESULTSFc.lpDx, (jintLong)lpStruct->lpDx);
+	(*env)->SetIntLongField(env, lpObject, GCP_RESULTSFc.lpCaretPos, (jintLong)lpStruct->lpCaretPos);
+	(*env)->SetIntLongField(env, lpObject, GCP_RESULTSFc.lpClass, (jintLong)lpStruct->lpClass);
+	(*env)->SetIntLongField(env, lpObject, GCP_RESULTSFc.lpGlyphs, (jintLong)lpStruct->lpGlyphs);
 	(*env)->SetIntField(env, lpObject, GCP_RESULTSFc.nGlyphs, (jint)lpStruct->nGlyphs);
 	(*env)->SetIntField(env, lpObject, GCP_RESULTSFc.nMaxFit, (jint)lpStruct->nMaxFit);
 }
@@ -1465,12 +1465,12 @@ void cacheGUITHREADINFOFields(JNIEnv *env, jobject lpObject)
 	GUITHREADINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	GUITHREADINFOFc.cbSize = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "cbSize", "I");
 	GUITHREADINFOFc.flags = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "flags", "I");
-	GUITHREADINFOFc.hwndActive = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndActive", "I");
-	GUITHREADINFOFc.hwndFocus = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndFocus", "I");
-	GUITHREADINFOFc.hwndCapture = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndCapture", "I");
-	GUITHREADINFOFc.hwndMenuOwner = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndMenuOwner", "I");
-	GUITHREADINFOFc.hwndMoveSize = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndMoveSize", "I");
-	GUITHREADINFOFc.hwndCaret = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndCaret", "I");
+	GUITHREADINFOFc.hwndActive = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndActive", I_J);
+	GUITHREADINFOFc.hwndFocus = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndFocus", I_J);
+	GUITHREADINFOFc.hwndCapture = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndCapture", I_J);
+	GUITHREADINFOFc.hwndMenuOwner = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndMenuOwner", I_J);
+	GUITHREADINFOFc.hwndMoveSize = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndMoveSize", I_J);
+	GUITHREADINFOFc.hwndCaret = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "hwndCaret", I_J);
 	GUITHREADINFOFc.left = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "left", "I");
 	GUITHREADINFOFc.top = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "top", "I");
 	GUITHREADINFOFc.right = (*env)->GetFieldID(env, GUITHREADINFOFc.clazz, "right", "I");
@@ -1483,12 +1483,12 @@ GUITHREADINFO *getGUITHREADINFOFields(JNIEnv *env, jobject lpObject, GUITHREADIN
 	if (!GUITHREADINFOFc.cached) cacheGUITHREADINFOFields(env, lpObject);
 	lpStruct->cbSize = (DWORD)(*env)->GetIntField(env, lpObject, GUITHREADINFOFc.cbSize);
 	lpStruct->flags = (DWORD)(*env)->GetIntField(env, lpObject, GUITHREADINFOFc.flags);
-	lpStruct->hwndActive = (HWND)(*env)->GetIntField(env, lpObject, GUITHREADINFOFc.hwndActive);
-	lpStruct->hwndFocus = (HWND)(*env)->GetIntField(env, lpObject, GUITHREADINFOFc.hwndFocus);
-	lpStruct->hwndCapture = (HWND)(*env)->GetIntField(env, lpObject, GUITHREADINFOFc.hwndCapture);
-	lpStruct->hwndMenuOwner = (HWND)(*env)->GetIntField(env, lpObject, GUITHREADINFOFc.hwndMenuOwner);
-	lpStruct->hwndMoveSize = (HWND)(*env)->GetIntField(env, lpObject, GUITHREADINFOFc.hwndMoveSize);
-	lpStruct->hwndCaret = (HWND)(*env)->GetIntField(env, lpObject, GUITHREADINFOFc.hwndCaret);
+	lpStruct->hwndActive = (HWND)(*env)->GetIntLongField(env, lpObject, GUITHREADINFOFc.hwndActive);
+	lpStruct->hwndFocus = (HWND)(*env)->GetIntLongField(env, lpObject, GUITHREADINFOFc.hwndFocus);
+	lpStruct->hwndCapture = (HWND)(*env)->GetIntLongField(env, lpObject, GUITHREADINFOFc.hwndCapture);
+	lpStruct->hwndMenuOwner = (HWND)(*env)->GetIntLongField(env, lpObject, GUITHREADINFOFc.hwndMenuOwner);
+	lpStruct->hwndMoveSize = (HWND)(*env)->GetIntLongField(env, lpObject, GUITHREADINFOFc.hwndMoveSize);
+	lpStruct->hwndCaret = (HWND)(*env)->GetIntLongField(env, lpObject, GUITHREADINFOFc.hwndCaret);
 	lpStruct->rcCaret.left = (*env)->GetIntField(env, lpObject, GUITHREADINFOFc.left);
 	lpStruct->rcCaret.top = (*env)->GetIntField(env, lpObject, GUITHREADINFOFc.top);
 	lpStruct->rcCaret.right = (*env)->GetIntField(env, lpObject, GUITHREADINFOFc.right);
@@ -1501,12 +1501,12 @@ void setGUITHREADINFOFields(JNIEnv *env, jobject lpObject, GUITHREADINFO *lpStru
 	if (!GUITHREADINFOFc.cached) cacheGUITHREADINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, GUITHREADINFOFc.cbSize, (jint)lpStruct->cbSize);
 	(*env)->SetIntField(env, lpObject, GUITHREADINFOFc.flags, (jint)lpStruct->flags);
-	(*env)->SetIntField(env, lpObject, GUITHREADINFOFc.hwndActive, (jint)lpStruct->hwndActive);
-	(*env)->SetIntField(env, lpObject, GUITHREADINFOFc.hwndFocus, (jint)lpStruct->hwndFocus);
-	(*env)->SetIntField(env, lpObject, GUITHREADINFOFc.hwndCapture, (jint)lpStruct->hwndCapture);
-	(*env)->SetIntField(env, lpObject, GUITHREADINFOFc.hwndMenuOwner, (jint)lpStruct->hwndMenuOwner);
-	(*env)->SetIntField(env, lpObject, GUITHREADINFOFc.hwndMoveSize, (jint)lpStruct->hwndMoveSize);
-	(*env)->SetIntField(env, lpObject, GUITHREADINFOFc.hwndCaret, (jint)lpStruct->hwndCaret);
+	(*env)->SetIntLongField(env, lpObject, GUITHREADINFOFc.hwndActive, (jintLong)lpStruct->hwndActive);
+	(*env)->SetIntLongField(env, lpObject, GUITHREADINFOFc.hwndFocus, (jintLong)lpStruct->hwndFocus);
+	(*env)->SetIntLongField(env, lpObject, GUITHREADINFOFc.hwndCapture, (jintLong)lpStruct->hwndCapture);
+	(*env)->SetIntLongField(env, lpObject, GUITHREADINFOFc.hwndMenuOwner, (jintLong)lpStruct->hwndMenuOwner);
+	(*env)->SetIntLongField(env, lpObject, GUITHREADINFOFc.hwndMoveSize, (jintLong)lpStruct->hwndMoveSize);
+	(*env)->SetIntLongField(env, lpObject, GUITHREADINFOFc.hwndCaret, (jintLong)lpStruct->hwndCaret);
 	(*env)->SetIntField(env, lpObject, GUITHREADINFOFc.left, (jint)lpStruct->rcCaret.left);
 	(*env)->SetIntField(env, lpObject, GUITHREADINFOFc.top, (jint)lpStruct->rcCaret.top);
 	(*env)->SetIntField(env, lpObject, GUITHREADINFOFc.right, (jint)lpStruct->rcCaret.right);
@@ -1569,15 +1569,15 @@ void cacheHDITEMFields(JNIEnv *env, jobject lpObject)
 	HDITEMFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	HDITEMFc.mask = (*env)->GetFieldID(env, HDITEMFc.clazz, "mask", "I");
 	HDITEMFc.cxy = (*env)->GetFieldID(env, HDITEMFc.clazz, "cxy", "I");
-	HDITEMFc.pszText = (*env)->GetFieldID(env, HDITEMFc.clazz, "pszText", "I");
-	HDITEMFc.hbm = (*env)->GetFieldID(env, HDITEMFc.clazz, "hbm", "I");
+	HDITEMFc.pszText = (*env)->GetFieldID(env, HDITEMFc.clazz, "pszText", I_J);
+	HDITEMFc.hbm = (*env)->GetFieldID(env, HDITEMFc.clazz, "hbm", I_J);
 	HDITEMFc.cchTextMax = (*env)->GetFieldID(env, HDITEMFc.clazz, "cchTextMax", "I");
 	HDITEMFc.fmt = (*env)->GetFieldID(env, HDITEMFc.clazz, "fmt", "I");
-	HDITEMFc.lParam = (*env)->GetFieldID(env, HDITEMFc.clazz, "lParam", "I");
+	HDITEMFc.lParam = (*env)->GetFieldID(env, HDITEMFc.clazz, "lParam", I_J);
 	HDITEMFc.iImage = (*env)->GetFieldID(env, HDITEMFc.clazz, "iImage", "I");
 	HDITEMFc.iOrder = (*env)->GetFieldID(env, HDITEMFc.clazz, "iOrder", "I");
 	HDITEMFc.type = (*env)->GetFieldID(env, HDITEMFc.clazz, "type", "I");
-	HDITEMFc.pvFilter = (*env)->GetFieldID(env, HDITEMFc.clazz, "pvFilter", "I");
+	HDITEMFc.pvFilter = (*env)->GetFieldID(env, HDITEMFc.clazz, "pvFilter", I_J);
 	HDITEMFc.cached = 1;
 }
 
@@ -1586,18 +1586,18 @@ HDITEM *getHDITEMFields(JNIEnv *env, jobject lpObject, HDITEM *lpStruct)
 	if (!HDITEMFc.cached) cacheHDITEMFields(env, lpObject);
 	lpStruct->mask = (*env)->GetIntField(env, lpObject, HDITEMFc.mask);
 	lpStruct->cxy = (*env)->GetIntField(env, lpObject, HDITEMFc.cxy);
-	lpStruct->pszText = (LPTSTR)(*env)->GetIntField(env, lpObject, HDITEMFc.pszText);
-	lpStruct->hbm = (HBITMAP)(*env)->GetIntField(env, lpObject, HDITEMFc.hbm);
+	lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, HDITEMFc.pszText);
+	lpStruct->hbm = (HBITMAP)(*env)->GetIntLongField(env, lpObject, HDITEMFc.hbm);
 	lpStruct->cchTextMax = (*env)->GetIntField(env, lpObject, HDITEMFc.cchTextMax);
 	lpStruct->fmt = (*env)->GetIntField(env, lpObject, HDITEMFc.fmt);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, HDITEMFc.lParam);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, HDITEMFc.lParam);
 	lpStruct->iImage = (*env)->GetIntField(env, lpObject, HDITEMFc.iImage);
 	lpStruct->iOrder = (*env)->GetIntField(env, lpObject, HDITEMFc.iOrder);
 #ifndef _WIN32_WCE
 	lpStruct->type = (*env)->GetIntField(env, lpObject, HDITEMFc.type);
 #endif
 #ifndef _WIN32_WCE
-	lpStruct->pvFilter = (void *)(*env)->GetIntField(env, lpObject, HDITEMFc.pvFilter);
+	lpStruct->pvFilter = (void *)(*env)->GetIntLongField(env, lpObject, HDITEMFc.pvFilter);
 #endif
 	return lpStruct;
 }
@@ -1607,18 +1607,18 @@ void setHDITEMFields(JNIEnv *env, jobject lpObject, HDITEM *lpStruct)
 	if (!HDITEMFc.cached) cacheHDITEMFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, HDITEMFc.mask, (jint)lpStruct->mask);
 	(*env)->SetIntField(env, lpObject, HDITEMFc.cxy, (jint)lpStruct->cxy);
-	(*env)->SetIntField(env, lpObject, HDITEMFc.pszText, (jint)lpStruct->pszText);
-	(*env)->SetIntField(env, lpObject, HDITEMFc.hbm, (jint)lpStruct->hbm);
+	(*env)->SetIntLongField(env, lpObject, HDITEMFc.pszText, (jintLong)lpStruct->pszText);
+	(*env)->SetIntLongField(env, lpObject, HDITEMFc.hbm, (jintLong)lpStruct->hbm);
 	(*env)->SetIntField(env, lpObject, HDITEMFc.cchTextMax, (jint)lpStruct->cchTextMax);
 	(*env)->SetIntField(env, lpObject, HDITEMFc.fmt, (jint)lpStruct->fmt);
-	(*env)->SetIntField(env, lpObject, HDITEMFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, HDITEMFc.lParam, (jintLong)lpStruct->lParam);
 	(*env)->SetIntField(env, lpObject, HDITEMFc.iImage, (jint)lpStruct->iImage);
 	(*env)->SetIntField(env, lpObject, HDITEMFc.iOrder, (jint)lpStruct->iOrder);
 #ifndef _WIN32_WCE
 	(*env)->SetIntField(env, lpObject, HDITEMFc.type, (jint)lpStruct->type);
 #endif
 #ifndef _WIN32_WCE
-	(*env)->SetIntField(env, lpObject, HDITEMFc.pvFilter, (jint)lpStruct->pvFilter);
+	(*env)->SetIntLongField(env, lpObject, HDITEMFc.pvFilter, (jintLong)lpStruct->pvFilter);
 #endif
 }
 #endif
@@ -1636,24 +1636,24 @@ void cacheHDLAYOUTFields(JNIEnv *env, jobject lpObject)
 {
 	if (HDLAYOUTFc.cached) return;
 	HDLAYOUTFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	HDLAYOUTFc.prc = (*env)->GetFieldID(env, HDLAYOUTFc.clazz, "prc", "I");
-	HDLAYOUTFc.pwpos = (*env)->GetFieldID(env, HDLAYOUTFc.clazz, "pwpos", "I");
+	HDLAYOUTFc.prc = (*env)->GetFieldID(env, HDLAYOUTFc.clazz, "prc", I_J);
+	HDLAYOUTFc.pwpos = (*env)->GetFieldID(env, HDLAYOUTFc.clazz, "pwpos", I_J);
 	HDLAYOUTFc.cached = 1;
 }
 
 HDLAYOUT *getHDLAYOUTFields(JNIEnv *env, jobject lpObject, HDLAYOUT *lpStruct)
 {
 	if (!HDLAYOUTFc.cached) cacheHDLAYOUTFields(env, lpObject);
-	lpStruct->prc = (RECT *)(*env)->GetIntField(env, lpObject, HDLAYOUTFc.prc);
-	lpStruct->pwpos = (WINDOWPOS *)(*env)->GetIntField(env, lpObject, HDLAYOUTFc.pwpos);
+	lpStruct->prc = (RECT *)(*env)->GetIntLongField(env, lpObject, HDLAYOUTFc.prc);
+	lpStruct->pwpos = (WINDOWPOS *)(*env)->GetIntLongField(env, lpObject, HDLAYOUTFc.pwpos);
 	return lpStruct;
 }
 
 void setHDLAYOUTFields(JNIEnv *env, jobject lpObject, HDLAYOUT *lpStruct)
 {
 	if (!HDLAYOUTFc.cached) cacheHDLAYOUTFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, HDLAYOUTFc.prc, (jint)lpStruct->prc);
-	(*env)->SetIntField(env, lpObject, HDLAYOUTFc.pwpos, (jint)lpStruct->pwpos);
+	(*env)->SetIntLongField(env, lpObject, HDLAYOUTFc.prc, (jintLong)lpStruct->prc);
+	(*env)->SetIntLongField(env, lpObject, HDLAYOUTFc.pwpos, (jintLong)lpStruct->pwpos);
 }
 #endif
 
@@ -1673,7 +1673,7 @@ void cacheHELPINFOFields(JNIEnv *env, jobject lpObject)
 	HELPINFOFc.cbSize = (*env)->GetFieldID(env, HELPINFOFc.clazz, "cbSize", "I");
 	HELPINFOFc.iContextType = (*env)->GetFieldID(env, HELPINFOFc.clazz, "iContextType", "I");
 	HELPINFOFc.iCtrlId = (*env)->GetFieldID(env, HELPINFOFc.clazz, "iCtrlId", "I");
-	HELPINFOFc.hItemHandle = (*env)->GetFieldID(env, HELPINFOFc.clazz, "hItemHandle", "I");
+	HELPINFOFc.hItemHandle = (*env)->GetFieldID(env, HELPINFOFc.clazz, "hItemHandle", I_J);
 	HELPINFOFc.dwContextId = (*env)->GetFieldID(env, HELPINFOFc.clazz, "dwContextId", "I");
 	HELPINFOFc.x = (*env)->GetFieldID(env, HELPINFOFc.clazz, "x", "I");
 	HELPINFOFc.y = (*env)->GetFieldID(env, HELPINFOFc.clazz, "y", "I");
@@ -1686,7 +1686,7 @@ HELPINFO *getHELPINFOFields(JNIEnv *env, jobject lpObject, HELPINFO *lpStruct)
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, HELPINFOFc.cbSize);
 	lpStruct->iContextType = (*env)->GetIntField(env, lpObject, HELPINFOFc.iContextType);
 	lpStruct->iCtrlId = (*env)->GetIntField(env, lpObject, HELPINFOFc.iCtrlId);
-	lpStruct->hItemHandle = (HANDLE)(*env)->GetIntField(env, lpObject, HELPINFOFc.hItemHandle);
+	lpStruct->hItemHandle = (HANDLE)(*env)->GetIntLongField(env, lpObject, HELPINFOFc.hItemHandle);
 	lpStruct->dwContextId = (*env)->GetIntField(env, lpObject, HELPINFOFc.dwContextId);
 	lpStruct->MousePos.x = (*env)->GetIntField(env, lpObject, HELPINFOFc.x);
 	lpStruct->MousePos.y = (*env)->GetIntField(env, lpObject, HELPINFOFc.y);
@@ -1699,7 +1699,7 @@ void setHELPINFOFields(JNIEnv *env, jobject lpObject, HELPINFO *lpStruct)
 	(*env)->SetIntField(env, lpObject, HELPINFOFc.cbSize, (jint)lpStruct->cbSize);
 	(*env)->SetIntField(env, lpObject, HELPINFOFc.iContextType, (jint)lpStruct->iContextType);
 	(*env)->SetIntField(env, lpObject, HELPINFOFc.iCtrlId, (jint)lpStruct->iCtrlId);
-	(*env)->SetIntField(env, lpObject, HELPINFOFc.hItemHandle, (jint)lpStruct->hItemHandle);
+	(*env)->SetIntLongField(env, lpObject, HELPINFOFc.hItemHandle, (jintLong)lpStruct->hItemHandle);
 	(*env)->SetIntField(env, lpObject, HELPINFOFc.dwContextId, (jint)lpStruct->dwContextId);
 	(*env)->SetIntField(env, lpObject, HELPINFOFc.x, (jint)lpStruct->MousePos.x);
 	(*env)->SetIntField(env, lpObject, HELPINFOFc.y, (jint)lpStruct->MousePos.y);
@@ -1721,7 +1721,7 @@ void cacheHIGHCONTRASTFields(JNIEnv *env, jobject lpObject)
 	HIGHCONTRASTFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	HIGHCONTRASTFc.cbSize = (*env)->GetFieldID(env, HIGHCONTRASTFc.clazz, "cbSize", "I");
 	HIGHCONTRASTFc.dwFlags = (*env)->GetFieldID(env, HIGHCONTRASTFc.clazz, "dwFlags", "I");
-	HIGHCONTRASTFc.lpszDefaultScheme = (*env)->GetFieldID(env, HIGHCONTRASTFc.clazz, "lpszDefaultScheme", "I");
+	HIGHCONTRASTFc.lpszDefaultScheme = (*env)->GetFieldID(env, HIGHCONTRASTFc.clazz, "lpszDefaultScheme", I_J);
 	HIGHCONTRASTFc.cached = 1;
 }
 
@@ -1730,7 +1730,7 @@ HIGHCONTRAST *getHIGHCONTRASTFields(JNIEnv *env, jobject lpObject, HIGHCONTRAST
 	if (!HIGHCONTRASTFc.cached) cacheHIGHCONTRASTFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, HIGHCONTRASTFc.cbSize);
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, HIGHCONTRASTFc.dwFlags);
-	lpStruct->lpszDefaultScheme = (LPTSTR)(*env)->GetIntField(env, lpObject, HIGHCONTRASTFc.lpszDefaultScheme);
+	lpStruct->lpszDefaultScheme = (LPTSTR)(*env)->GetIntLongField(env, lpObject, HIGHCONTRASTFc.lpszDefaultScheme);
 	return lpStruct;
 }
 
@@ -1739,7 +1739,7 @@ void setHIGHCONTRASTFields(JNIEnv *env, jobject lpObject, HIGHCONTRAST *lpStruct
 	if (!HIGHCONTRASTFc.cached) cacheHIGHCONTRASTFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, HIGHCONTRASTFc.cbSize, (jint)lpStruct->cbSize);
 	(*env)->SetIntField(env, lpObject, HIGHCONTRASTFc.dwFlags, (jint)lpStruct->dwFlags);
-	(*env)->SetIntField(env, lpObject, HIGHCONTRASTFc.lpszDefaultScheme, (jint)lpStruct->lpszDefaultScheme);
+	(*env)->SetIntLongField(env, lpObject, HIGHCONTRASTFc.lpszDefaultScheme, (jintLong)lpStruct->lpszDefaultScheme);
 }
 #endif
 
@@ -1759,8 +1759,8 @@ void cacheICONINFOFields(JNIEnv *env, jobject lpObject)
 	ICONINFOFc.fIcon = (*env)->GetFieldID(env, ICONINFOFc.clazz, "fIcon", "Z");
 	ICONINFOFc.xHotspot = (*env)->GetFieldID(env, ICONINFOFc.clazz, "xHotspot", "I");
 	ICONINFOFc.yHotspot = (*env)->GetFieldID(env, ICONINFOFc.clazz, "yHotspot", "I");
-	ICONINFOFc.hbmMask = (*env)->GetFieldID(env, ICONINFOFc.clazz, "hbmMask", "I");
-	ICONINFOFc.hbmColor = (*env)->GetFieldID(env, ICONINFOFc.clazz, "hbmColor", "I");
+	ICONINFOFc.hbmMask = (*env)->GetFieldID(env, ICONINFOFc.clazz, "hbmMask", I_J);
+	ICONINFOFc.hbmColor = (*env)->GetFieldID(env, ICONINFOFc.clazz, "hbmColor", I_J);
 	ICONINFOFc.cached = 1;
 }
 
@@ -1770,8 +1770,8 @@ ICONINFO *getICONINFOFields(JNIEnv *env, jobject lpObject, ICONINFO *lpStruct)
 	lpStruct->fIcon = (*env)->GetBooleanField(env, lpObject, ICONINFOFc.fIcon);
 	lpStruct->xHotspot = (*env)->GetIntField(env, lpObject, ICONINFOFc.xHotspot);
 	lpStruct->yHotspot = (*env)->GetIntField(env, lpObject, ICONINFOFc.yHotspot);
-	lpStruct->hbmMask = (HBITMAP)(*env)->GetIntField(env, lpObject, ICONINFOFc.hbmMask);
-	lpStruct->hbmColor = (HBITMAP)(*env)->GetIntField(env, lpObject, ICONINFOFc.hbmColor);
+	lpStruct->hbmMask = (HBITMAP)(*env)->GetIntLongField(env, lpObject, ICONINFOFc.hbmMask);
+	lpStruct->hbmColor = (HBITMAP)(*env)->GetIntLongField(env, lpObject, ICONINFOFc.hbmColor);
 	return lpStruct;
 }
 
@@ -1781,8 +1781,8 @@ void setICONINFOFields(JNIEnv *env, jobject lpObject, ICONINFO *lpStruct)
 	(*env)->SetBooleanField(env, lpObject, ICONINFOFc.fIcon, (jboolean)lpStruct->fIcon);
 	(*env)->SetIntField(env, lpObject, ICONINFOFc.xHotspot, (jint)lpStruct->xHotspot);
 	(*env)->SetIntField(env, lpObject, ICONINFOFc.yHotspot, (jint)lpStruct->yHotspot);
-	(*env)->SetIntField(env, lpObject, ICONINFOFc.hbmMask, (jint)lpStruct->hbmMask);
-	(*env)->SetIntField(env, lpObject, ICONINFOFc.hbmColor, (jint)lpStruct->hbmColor);
+	(*env)->SetIntLongField(env, lpObject, ICONINFOFc.hbmMask, (jintLong)lpStruct->hbmMask);
+	(*env)->SetIntLongField(env, lpObject, ICONINFOFc.hbmColor, (jintLong)lpStruct->hbmColor);
 }
 #endif
 
@@ -1868,7 +1868,7 @@ void cacheKEYBDINPUTFields(JNIEnv *env, jobject lpObject)
 	KEYBDINPUTFc.wScan = (*env)->GetFieldID(env, KEYBDINPUTFc.clazz, "wScan", "S");
 	KEYBDINPUTFc.dwFlags = (*env)->GetFieldID(env, KEYBDINPUTFc.clazz, "dwFlags", "I");
 	KEYBDINPUTFc.time = (*env)->GetFieldID(env, KEYBDINPUTFc.clazz, "time", "I");
-	KEYBDINPUTFc.dwExtraInfo = (*env)->GetFieldID(env, KEYBDINPUTFc.clazz, "dwExtraInfo", "I");
+	KEYBDINPUTFc.dwExtraInfo = (*env)->GetFieldID(env, KEYBDINPUTFc.clazz, "dwExtraInfo", I_J);
 	KEYBDINPUTFc.cached = 1;
 }
 
@@ -1879,7 +1879,7 @@ KEYBDINPUT *getKEYBDINPUTFields(JNIEnv *env, jobject lpObject, KEYBDINPUT *lpStr
 	lpStruct->wScan = (*env)->GetShortField(env, lpObject, KEYBDINPUTFc.wScan);
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, KEYBDINPUTFc.dwFlags);
 	lpStruct->time = (*env)->GetIntField(env, lpObject, KEYBDINPUTFc.time);
-	lpStruct->dwExtraInfo = (*env)->GetIntField(env, lpObject, KEYBDINPUTFc.dwExtraInfo);
+	lpStruct->dwExtraInfo = (*env)->GetIntLongField(env, lpObject, KEYBDINPUTFc.dwExtraInfo);
 	return lpStruct;
 }
 
@@ -1890,7 +1890,7 @@ void setKEYBDINPUTFields(JNIEnv *env, jobject lpObject, KEYBDINPUT *lpStruct)
 	(*env)->SetShortField(env, lpObject, KEYBDINPUTFc.wScan, (jshort)lpStruct->wScan);
 	(*env)->SetIntField(env, lpObject, KEYBDINPUTFc.dwFlags, (jint)lpStruct->dwFlags);
 	(*env)->SetIntField(env, lpObject, KEYBDINPUTFc.time, (jint)lpStruct->time);
-	(*env)->SetIntField(env, lpObject, KEYBDINPUTFc.dwExtraInfo, (jint)lpStruct->dwExtraInfo);
+	(*env)->SetIntLongField(env, lpObject, KEYBDINPUTFc.dwExtraInfo, (jintLong)lpStruct->dwExtraInfo);
 }
 #endif
 
@@ -1925,11 +1925,11 @@ LITEM *getLITEMFields(JNIEnv *env, jobject lpObject, LITEM *lpStruct)
 	lpStruct->stateMask = (*env)->GetIntField(env, lpObject, LITEMFc.stateMask);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, LITEMFc.szID);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szID) / 2, (jchar *)lpStruct->szID);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szID) / sizeof(jchar), (jchar *)lpStruct->szID);
 	}
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, LITEMFc.szUrl);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szUrl) / 2, (jchar *)lpStruct->szUrl);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szUrl) / sizeof(jchar), (jchar *)lpStruct->szUrl);
 	}
 	return lpStruct;
 }
@@ -1943,11 +1943,11 @@ void setLITEMFields(JNIEnv *env, jobject lpObject, LITEM *lpStruct)
 	(*env)->SetIntField(env, lpObject, LITEMFc.stateMask, (jint)lpStruct->stateMask);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, LITEMFc.szID);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szID) / 2, (jchar *)lpStruct->szID);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szID) / sizeof(jchar), (jchar *)lpStruct->szID);
 	}
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, LITEMFc.szUrl);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szUrl) / 2, (jchar *)lpStruct->szUrl);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szUrl) / sizeof(jchar), (jchar *)lpStruct->szUrl);
 	}
 }
 #endif
@@ -1967,7 +1967,7 @@ void cacheLOGBRUSHFields(JNIEnv *env, jobject lpObject)
 	LOGBRUSHFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	LOGBRUSHFc.lbStyle = (*env)->GetFieldID(env, LOGBRUSHFc.clazz, "lbStyle", "I");
 	LOGBRUSHFc.lbColor = (*env)->GetFieldID(env, LOGBRUSHFc.clazz, "lbColor", "I");
-	LOGBRUSHFc.lbHatch = (*env)->GetFieldID(env, LOGBRUSHFc.clazz, "lbHatch", "I");
+	LOGBRUSHFc.lbHatch = (*env)->GetFieldID(env, LOGBRUSHFc.clazz, "lbHatch", I_J);
 	LOGBRUSHFc.cached = 1;
 }
 
@@ -1976,7 +1976,7 @@ LOGBRUSH *getLOGBRUSHFields(JNIEnv *env, jobject lpObject, LOGBRUSH *lpStruct)
 	if (!LOGBRUSHFc.cached) cacheLOGBRUSHFields(env, lpObject);
 	lpStruct->lbStyle = (*env)->GetIntField(env, lpObject, LOGBRUSHFc.lbStyle);
 	lpStruct->lbColor = (*env)->GetIntField(env, lpObject, LOGBRUSHFc.lbColor);
-	lpStruct->lbHatch = (*env)->GetIntField(env, lpObject, LOGBRUSHFc.lbHatch);
+	lpStruct->lbHatch = (*env)->GetIntLongField(env, lpObject, LOGBRUSHFc.lbHatch);
 	return lpStruct;
 }
 
@@ -1985,7 +1985,7 @@ void setLOGBRUSHFields(JNIEnv *env, jobject lpObject, LOGBRUSH *lpStruct)
 	if (!LOGBRUSHFc.cached) cacheLOGBRUSHFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, LOGBRUSHFc.lbStyle, (jint)lpStruct->lbStyle);
 	(*env)->SetIntField(env, lpObject, LOGBRUSHFc.lbColor, (jint)lpStruct->lbColor);
-	(*env)->SetIntField(env, lpObject, LOGBRUSHFc.lbHatch, (jint)lpStruct->lbHatch);
+	(*env)->SetIntLongField(env, lpObject, LOGBRUSHFc.lbHatch, (jintLong)lpStruct->lbHatch);
 }
 #endif
 
@@ -2156,7 +2156,7 @@ LOGFONTW *getLOGFONTWFields(JNIEnv *env, jobject lpObject, LOGFONTW *lpStruct)
 	lpStruct->lfPitchAndFamily = (*env)->GetByteField(env, lpObject, LOGFONTFc.lfPitchAndFamily);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, LOGFONTWFc.lfFaceName);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->lfFaceName) / 2, (jchar *)lpStruct->lfFaceName);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->lfFaceName) / sizeof(jchar), (jchar *)lpStruct->lfFaceName);
 	}
 	return lpStruct;
 }
@@ -2179,7 +2179,7 @@ void setLOGFONTWFields(JNIEnv *env, jobject lpObject, LOGFONTW *lpStruct)
 	(*env)->SetByteField(env, lpObject, LOGFONTFc.lfPitchAndFamily, (jbyte)lpStruct->lfPitchAndFamily);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, LOGFONTWFc.lfFaceName);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->lfFaceName) / 2, (jchar *)lpStruct->lfFaceName);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->lfFaceName) / sizeof(jchar), (jchar *)lpStruct->lfFaceName);
 	}
 }
 #endif
@@ -2240,7 +2240,7 @@ void cacheLVCOLUMNFields(JNIEnv *env, jobject lpObject)
 	LVCOLUMNFc.mask = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "mask", "I");
 	LVCOLUMNFc.fmt = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "fmt", "I");
 	LVCOLUMNFc.cx = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "cx", "I");
-	LVCOLUMNFc.pszText = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "pszText", "I");
+	LVCOLUMNFc.pszText = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "pszText", I_J);
 	LVCOLUMNFc.cchTextMax = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "cchTextMax", "I");
 	LVCOLUMNFc.iSubItem = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "iSubItem", "I");
 	LVCOLUMNFc.iImage = (*env)->GetFieldID(env, LVCOLUMNFc.clazz, "iImage", "I");
@@ -2254,7 +2254,7 @@ LVCOLUMN *getLVCOLUMNFields(JNIEnv *env, jobject lpObject, LVCOLUMN *lpStruct)
 	lpStruct->mask = (*env)->GetIntField(env, lpObject, LVCOLUMNFc.mask);
 	lpStruct->fmt = (*env)->GetIntField(env, lpObject, LVCOLUMNFc.fmt);
 	lpStruct->cx = (*env)->GetIntField(env, lpObject, LVCOLUMNFc.cx);
-	lpStruct->pszText = (LPTSTR)(*env)->GetIntField(env, lpObject, LVCOLUMNFc.pszText);
+	lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, LVCOLUMNFc.pszText);
 	lpStruct->cchTextMax = (*env)->GetIntField(env, lpObject, LVCOLUMNFc.cchTextMax);
 	lpStruct->iSubItem = (*env)->GetIntField(env, lpObject, LVCOLUMNFc.iSubItem);
 	lpStruct->iImage = (*env)->GetIntField(env, lpObject, LVCOLUMNFc.iImage);
@@ -2268,7 +2268,7 @@ void setLVCOLUMNFields(JNIEnv *env, jobject lpObject, LVCOLUMN *lpStruct)
 	(*env)->SetIntField(env, lpObject, LVCOLUMNFc.mask, (jint)lpStruct->mask);
 	(*env)->SetIntField(env, lpObject, LVCOLUMNFc.fmt, (jint)lpStruct->fmt);
 	(*env)->SetIntField(env, lpObject, LVCOLUMNFc.cx, (jint)lpStruct->cx);
-	(*env)->SetIntField(env, lpObject, LVCOLUMNFc.pszText, (jint)lpStruct->pszText);
+	(*env)->SetIntLongField(env, lpObject, LVCOLUMNFc.pszText, (jintLong)lpStruct->pszText);
 	(*env)->SetIntField(env, lpObject, LVCOLUMNFc.cchTextMax, (jint)lpStruct->cchTextMax);
 	(*env)->SetIntField(env, lpObject, LVCOLUMNFc.iSubItem, (jint)lpStruct->iSubItem);
 	(*env)->SetIntField(env, lpObject, LVCOLUMNFc.iImage, (jint)lpStruct->iImage);
@@ -2337,14 +2337,14 @@ void cacheLVITEMFields(JNIEnv *env, jobject lpObject)
 	LVITEMFc.iSubItem = (*env)->GetFieldID(env, LVITEMFc.clazz, "iSubItem", "I");
 	LVITEMFc.state = (*env)->GetFieldID(env, LVITEMFc.clazz, "state", "I");
 	LVITEMFc.stateMask = (*env)->GetFieldID(env, LVITEMFc.clazz, "stateMask", "I");
-	LVITEMFc.pszText = (*env)->GetFieldID(env, LVITEMFc.clazz, "pszText", "I");
+	LVITEMFc.pszText = (*env)->GetFieldID(env, LVITEMFc.clazz, "pszText", I_J);
 	LVITEMFc.cchTextMax = (*env)->GetFieldID(env, LVITEMFc.clazz, "cchTextMax", "I");
 	LVITEMFc.iImage = (*env)->GetFieldID(env, LVITEMFc.clazz, "iImage", "I");
-	LVITEMFc.lParam = (*env)->GetFieldID(env, LVITEMFc.clazz, "lParam", "I");
+	LVITEMFc.lParam = (*env)->GetFieldID(env, LVITEMFc.clazz, "lParam", I_J);
 	LVITEMFc.iIndent = (*env)->GetFieldID(env, LVITEMFc.clazz, "iIndent", "I");
 	LVITEMFc.iGroupId = (*env)->GetFieldID(env, LVITEMFc.clazz, "iGroupId", "I");
 	LVITEMFc.cColumns = (*env)->GetFieldID(env, LVITEMFc.clazz, "cColumns", "I");
-	LVITEMFc.puColumns = (*env)->GetFieldID(env, LVITEMFc.clazz, "puColumns", "I");
+	LVITEMFc.puColumns = (*env)->GetFieldID(env, LVITEMFc.clazz, "puColumns", I_J);
 	LVITEMFc.cached = 1;
 }
 
@@ -2356,10 +2356,10 @@ LVITEM *getLVITEMFields(JNIEnv *env, jobject lpObject, LVITEM *lpStruct)
 	lpStruct->iSubItem = (*env)->GetIntField(env, lpObject, LVITEMFc.iSubItem);
 	lpStruct->state = (*env)->GetIntField(env, lpObject, LVITEMFc.state);
 	lpStruct->stateMask = (*env)->GetIntField(env, lpObject, LVITEMFc.stateMask);
-	lpStruct->pszText = (LPTSTR)(*env)->GetIntField(env, lpObject, LVITEMFc.pszText);
+	lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, LVITEMFc.pszText);
 	lpStruct->cchTextMax = (*env)->GetIntField(env, lpObject, LVITEMFc.cchTextMax);
 	lpStruct->iImage = (*env)->GetIntField(env, lpObject, LVITEMFc.iImage);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, LVITEMFc.lParam);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, LVITEMFc.lParam);
 	lpStruct->iIndent = (*env)->GetIntField(env, lpObject, LVITEMFc.iIndent);
 #ifndef _WIN32_WCE
 	lpStruct->iGroupId = (*env)->GetIntField(env, lpObject, LVITEMFc.iGroupId);
@@ -2368,7 +2368,7 @@ LVITEM *getLVITEMFields(JNIEnv *env, jobject lpObject, LVITEM *lpStruct)
 	lpStruct->cColumns = (*env)->GetIntField(env, lpObject, LVITEMFc.cColumns);
 #endif
 #ifndef _WIN32_WCE
-	lpStruct->puColumns = (PUINT)(*env)->GetIntField(env, lpObject, LVITEMFc.puColumns);
+	lpStruct->puColumns = (PUINT)(*env)->GetIntLongField(env, lpObject, LVITEMFc.puColumns);
 #endif
 	return lpStruct;
 }
@@ -2381,10 +2381,10 @@ void setLVITEMFields(JNIEnv *env, jobject lpObject, LVITEM *lpStruct)
 	(*env)->SetIntField(env, lpObject, LVITEMFc.iSubItem, (jint)lpStruct->iSubItem);
 	(*env)->SetIntField(env, lpObject, LVITEMFc.state, (jint)lpStruct->state);
 	(*env)->SetIntField(env, lpObject, LVITEMFc.stateMask, (jint)lpStruct->stateMask);
-	(*env)->SetIntField(env, lpObject, LVITEMFc.pszText, (jint)lpStruct->pszText);
+	(*env)->SetIntLongField(env, lpObject, LVITEMFc.pszText, (jintLong)lpStruct->pszText);
 	(*env)->SetIntField(env, lpObject, LVITEMFc.cchTextMax, (jint)lpStruct->cchTextMax);
 	(*env)->SetIntField(env, lpObject, LVITEMFc.iImage, (jint)lpStruct->iImage);
-	(*env)->SetIntField(env, lpObject, LVITEMFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, LVITEMFc.lParam, (jintLong)lpStruct->lParam);
 	(*env)->SetIntField(env, lpObject, LVITEMFc.iIndent, (jint)lpStruct->iIndent);
 #ifndef _WIN32_WCE
 	(*env)->SetIntField(env, lpObject, LVITEMFc.iGroupId, (jint)lpStruct->iGroupId);
@@ -2393,7 +2393,7 @@ void setLVITEMFields(JNIEnv *env, jobject lpObject, LVITEM *lpStruct)
 	(*env)->SetIntField(env, lpObject, LVITEMFc.cColumns, (jint)lpStruct->cColumns);
 #endif
 #ifndef _WIN32_WCE
-	(*env)->SetIntField(env, lpObject, LVITEMFc.puColumns, (jint)lpStruct->puColumns);
+	(*env)->SetIntLongField(env, lpObject, LVITEMFc.puColumns, (jintLong)lpStruct->puColumns);
 #endif
 }
 #endif
@@ -2508,7 +2508,7 @@ void cacheMEASUREITEMSTRUCTFields(JNIEnv *env, jobject lpObject)
 	MEASUREITEMSTRUCTFc.itemID = (*env)->GetFieldID(env, MEASUREITEMSTRUCTFc.clazz, "itemID", "I");
 	MEASUREITEMSTRUCTFc.itemWidth = (*env)->GetFieldID(env, MEASUREITEMSTRUCTFc.clazz, "itemWidth", "I");
 	MEASUREITEMSTRUCTFc.itemHeight = (*env)->GetFieldID(env, MEASUREITEMSTRUCTFc.clazz, "itemHeight", "I");
-	MEASUREITEMSTRUCTFc.itemData = (*env)->GetFieldID(env, MEASUREITEMSTRUCTFc.clazz, "itemData", "I");
+	MEASUREITEMSTRUCTFc.itemData = (*env)->GetFieldID(env, MEASUREITEMSTRUCTFc.clazz, "itemData", I_J);
 	MEASUREITEMSTRUCTFc.cached = 1;
 }
 
@@ -2520,7 +2520,7 @@ MEASUREITEMSTRUCT *getMEASUREITEMSTRUCTFields(JNIEnv *env, jobject lpObject, MEA
 	lpStruct->itemID = (*env)->GetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemID);
 	lpStruct->itemWidth = (*env)->GetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemWidth);
 	lpStruct->itemHeight = (*env)->GetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemHeight);
-	lpStruct->itemData = (*env)->GetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemData);
+	lpStruct->itemData = (*env)->GetIntLongField(env, lpObject, MEASUREITEMSTRUCTFc.itemData);
 	return lpStruct;
 }
 
@@ -2532,7 +2532,7 @@ void setMEASUREITEMSTRUCTFields(JNIEnv *env, jobject lpObject, MEASUREITEMSTRUCT
 	(*env)->SetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemID, (jint)lpStruct->itemID);
 	(*env)->SetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemWidth, (jint)lpStruct->itemWidth);
 	(*env)->SetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemHeight, (jint)lpStruct->itemHeight);
-	(*env)->SetIntField(env, lpObject, MEASUREITEMSTRUCTFc.itemData, (jint)lpStruct->itemData);
+	(*env)->SetIntLongField(env, lpObject, MEASUREITEMSTRUCTFc.itemData, (jintLong)lpStruct->itemData);
 }
 #endif
 
@@ -2554,8 +2554,8 @@ void cacheMENUBARINFOFields(JNIEnv *env, jobject lpObject)
 	MENUBARINFOFc.top = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "top", "I");
 	MENUBARINFOFc.right = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "right", "I");
 	MENUBARINFOFc.bottom = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "bottom", "I");
-	MENUBARINFOFc.hMenu = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "hMenu", "I");
-	MENUBARINFOFc.hwndMenu = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "hwndMenu", "I");
+	MENUBARINFOFc.hMenu = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "hMenu", I_J);
+	MENUBARINFOFc.hwndMenu = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "hwndMenu", I_J);
 	MENUBARINFOFc.fBarFocused = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "fBarFocused", "Z");
 	MENUBARINFOFc.fFocused = (*env)->GetFieldID(env, MENUBARINFOFc.clazz, "fFocused", "Z");
 	MENUBARINFOFc.cached = 1;
@@ -2569,8 +2569,8 @@ MENUBARINFO *getMENUBARINFOFields(JNIEnv *env, jobject lpObject, MENUBARINFO *lp
 	lpStruct->rcBar.top = (*env)->GetIntField(env, lpObject, MENUBARINFOFc.top);
 	lpStruct->rcBar.right = (*env)->GetIntField(env, lpObject, MENUBARINFOFc.right);
 	lpStruct->rcBar.bottom = (*env)->GetIntField(env, lpObject, MENUBARINFOFc.bottom);
-	lpStruct->hMenu = (HMENU)(*env)->GetIntField(env, lpObject, MENUBARINFOFc.hMenu);
-	lpStruct->hwndMenu = (HWND)(*env)->GetIntField(env, lpObject, MENUBARINFOFc.hwndMenu);
+	lpStruct->hMenu = (HMENU)(*env)->GetIntLongField(env, lpObject, MENUBARINFOFc.hMenu);
+	lpStruct->hwndMenu = (HWND)(*env)->GetIntLongField(env, lpObject, MENUBARINFOFc.hwndMenu);
 	lpStruct->fBarFocused = (*env)->GetBooleanField(env, lpObject, MENUBARINFOFc.fBarFocused);
 	lpStruct->fFocused = (*env)->GetBooleanField(env, lpObject, MENUBARINFOFc.fFocused);
 	return lpStruct;
@@ -2584,8 +2584,8 @@ void setMENUBARINFOFields(JNIEnv *env, jobject lpObject, MENUBARINFO *lpStruct)
 	(*env)->SetIntField(env, lpObject, MENUBARINFOFc.top, (jint)lpStruct->rcBar.top);
 	(*env)->SetIntField(env, lpObject, MENUBARINFOFc.right, (jint)lpStruct->rcBar.right);
 	(*env)->SetIntField(env, lpObject, MENUBARINFOFc.bottom, (jint)lpStruct->rcBar.bottom);
-	(*env)->SetIntField(env, lpObject, MENUBARINFOFc.hMenu, (jint)lpStruct->hMenu);
-	(*env)->SetIntField(env, lpObject, MENUBARINFOFc.hwndMenu, (jint)lpStruct->hwndMenu);
+	(*env)->SetIntLongField(env, lpObject, MENUBARINFOFc.hMenu, (jintLong)lpStruct->hMenu);
+	(*env)->SetIntLongField(env, lpObject, MENUBARINFOFc.hwndMenu, (jintLong)lpStruct->hwndMenu);
 	(*env)->SetBooleanField(env, lpObject, MENUBARINFOFc.fBarFocused, (jboolean)lpStruct->fBarFocused);
 	(*env)->SetBooleanField(env, lpObject, MENUBARINFOFc.fFocused, (jboolean)lpStruct->fFocused);
 }
@@ -2608,9 +2608,9 @@ void cacheMENUINFOFields(JNIEnv *env, jobject lpObject)
 	MENUINFOFc.fMask = (*env)->GetFieldID(env, MENUINFOFc.clazz, "fMask", "I");
 	MENUINFOFc.dwStyle = (*env)->GetFieldID(env, MENUINFOFc.clazz, "dwStyle", "I");
 	MENUINFOFc.cyMax = (*env)->GetFieldID(env, MENUINFOFc.clazz, "cyMax", "I");
-	MENUINFOFc.hbrBack = (*env)->GetFieldID(env, MENUINFOFc.clazz, "hbrBack", "I");
+	MENUINFOFc.hbrBack = (*env)->GetFieldID(env, MENUINFOFc.clazz, "hbrBack", I_J);
 	MENUINFOFc.dwContextHelpID = (*env)->GetFieldID(env, MENUINFOFc.clazz, "dwContextHelpID", "I");
-	MENUINFOFc.dwMenuData = (*env)->GetFieldID(env, MENUINFOFc.clazz, "dwMenuData", "I");
+	MENUINFOFc.dwMenuData = (*env)->GetFieldID(env, MENUINFOFc.clazz, "dwMenuData", I_J);
 	MENUINFOFc.cached = 1;
 }
 
@@ -2621,9 +2621,9 @@ MENUINFO *getMENUINFOFields(JNIEnv *env, jobject lpObject, MENUINFO *lpStruct)
 	lpStruct->fMask = (*env)->GetIntField(env, lpObject, MENUINFOFc.fMask);
 	lpStruct->dwStyle = (*env)->GetIntField(env, lpObject, MENUINFOFc.dwStyle);
 	lpStruct->cyMax = (*env)->GetIntField(env, lpObject, MENUINFOFc.cyMax);
-	lpStruct->hbrBack = (HBRUSH)(*env)->GetIntField(env, lpObject, MENUINFOFc.hbrBack);
+	lpStruct->hbrBack = (HBRUSH)(*env)->GetIntLongField(env, lpObject, MENUINFOFc.hbrBack);
 	lpStruct->dwContextHelpID = (*env)->GetIntField(env, lpObject, MENUINFOFc.dwContextHelpID);
-	lpStruct->dwMenuData = (*env)->GetIntField(env, lpObject, MENUINFOFc.dwMenuData);
+	lpStruct->dwMenuData = (*env)->GetIntLongField(env, lpObject, MENUINFOFc.dwMenuData);
 	return lpStruct;
 }
 
@@ -2634,9 +2634,9 @@ void setMENUINFOFields(JNIEnv *env, jobject lpObject, MENUINFO *lpStruct)
 	(*env)->SetIntField(env, lpObject, MENUINFOFc.fMask, (jint)lpStruct->fMask);
 	(*env)->SetIntField(env, lpObject, MENUINFOFc.dwStyle, (jint)lpStruct->dwStyle);
 	(*env)->SetIntField(env, lpObject, MENUINFOFc.cyMax, (jint)lpStruct->cyMax);
-	(*env)->SetIntField(env, lpObject, MENUINFOFc.hbrBack, (jint)lpStruct->hbrBack);
+	(*env)->SetIntLongField(env, lpObject, MENUINFOFc.hbrBack, (jintLong)lpStruct->hbrBack);
 	(*env)->SetIntField(env, lpObject, MENUINFOFc.dwContextHelpID, (jint)lpStruct->dwContextHelpID);
-	(*env)->SetIntField(env, lpObject, MENUINFOFc.dwMenuData, (jint)lpStruct->dwMenuData);
+	(*env)->SetIntLongField(env, lpObject, MENUINFOFc.dwMenuData, (jintLong)lpStruct->dwMenuData);
 }
 #endif
 
@@ -2658,13 +2658,13 @@ void cacheMENUITEMINFOFields(JNIEnv *env, jobject lpObject)
 	MENUITEMINFOFc.fType = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "fType", "I");
 	MENUITEMINFOFc.fState = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "fState", "I");
 	MENUITEMINFOFc.wID = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "wID", "I");
-	MENUITEMINFOFc.hSubMenu = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hSubMenu", "I");
-	MENUITEMINFOFc.hbmpChecked = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hbmpChecked", "I");
-	MENUITEMINFOFc.hbmpUnchecked = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hbmpUnchecked", "I");
-	MENUITEMINFOFc.dwItemData = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "dwItemData", "I");
-	MENUITEMINFOFc.dwTypeData = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "dwTypeData", "I");
+	MENUITEMINFOFc.hSubMenu = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hSubMenu", I_J);
+	MENUITEMINFOFc.hbmpChecked = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hbmpChecked", I_J);
+	MENUITEMINFOFc.hbmpUnchecked = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hbmpUnchecked", I_J);
+	MENUITEMINFOFc.dwItemData = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "dwItemData", I_J);
+	MENUITEMINFOFc.dwTypeData = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "dwTypeData", I_J);
 	MENUITEMINFOFc.cch = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "cch", "I");
-	MENUITEMINFOFc.hbmpItem = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hbmpItem", "I");
+	MENUITEMINFOFc.hbmpItem = (*env)->GetFieldID(env, MENUITEMINFOFc.clazz, "hbmpItem", I_J);
 	MENUITEMINFOFc.cached = 1;
 }
 
@@ -2676,14 +2676,14 @@ MENUITEMINFO *getMENUITEMINFOFields(JNIEnv *env, jobject lpObject, MENUITEMINFO
 	lpStruct->fType = (*env)->GetIntField(env, lpObject, MENUITEMINFOFc.fType);
 	lpStruct->fState = (*env)->GetIntField(env, lpObject, MENUITEMINFOFc.fState);
 	lpStruct->wID = (*env)->GetIntField(env, lpObject, MENUITEMINFOFc.wID);
-	lpStruct->hSubMenu = (HMENU)(*env)->GetIntField(env, lpObject, MENUITEMINFOFc.hSubMenu);
-	lpStruct->hbmpChecked = (HBITMAP)(*env)->GetIntField(env, lpObject, MENUITEMINFOFc.hbmpChecked);
-	lpStruct->hbmpUnchecked = (HBITMAP)(*env)->GetIntField(env, lpObject, MENUITEMINFOFc.hbmpUnchecked);
-	lpStruct->dwItemData = (*env)->GetIntField(env, lpObject, MENUITEMINFOFc.dwItemData);
-	lpStruct->dwTypeData = (LPTSTR)(*env)->GetIntField(env, lpObject, MENUITEMINFOFc.dwTypeData);
+	lpStruct->hSubMenu = (HMENU)(*env)->GetIntLongField(env, lpObject, MENUITEMINFOFc.hSubMenu);
+	lpStruct->hbmpChecked = (HBITMAP)(*env)->GetIntLongField(env, lpObject, MENUITEMINFOFc.hbmpChecked);
+	lpStruct->hbmpUnchecked = (HBITMAP)(*env)->GetIntLongField(env, lpObject, MENUITEMINFOFc.hbmpUnchecked);
+	lpStruct->dwItemData = (*env)->GetIntLongField(env, lpObject, MENUITEMINFOFc.dwItemData);
+	lpStruct->dwTypeData = (LPTSTR)(*env)->GetIntLongField(env, lpObject, MENUITEMINFOFc.dwTypeData);
 	lpStruct->cch = (*env)->GetIntField(env, lpObject, MENUITEMINFOFc.cch);
 #ifndef _WIN32_WCE
-	lpStruct->hbmpItem = (HBITMAP)(*env)->GetIntField(env, lpObject, MENUITEMINFOFc.hbmpItem);
+	lpStruct->hbmpItem = (HBITMAP)(*env)->GetIntLongField(env, lpObject, MENUITEMINFOFc.hbmpItem);
 #endif
 	return lpStruct;
 }
@@ -2696,14 +2696,14 @@ void setMENUITEMINFOFields(JNIEnv *env, jobject lpObject, MENUITEMINFO *lpStruct
 	(*env)->SetIntField(env, lpObject, MENUITEMINFOFc.fType, (jint)lpStruct->fType);
 	(*env)->SetIntField(env, lpObject, MENUITEMINFOFc.fState, (jint)lpStruct->fState);
 	(*env)->SetIntField(env, lpObject, MENUITEMINFOFc.wID, (jint)lpStruct->wID);
-	(*env)->SetIntField(env, lpObject, MENUITEMINFOFc.hSubMenu, (jint)lpStruct->hSubMenu);
-	(*env)->SetIntField(env, lpObject, MENUITEMINFOFc.hbmpChecked, (jint)lpStruct->hbmpChecked);
-	(*env)->SetIntField(env, lpObject, MENUITEMINFOFc.hbmpUnchecked, (jint)lpStruct->hbmpUnchecked);
-	(*env)->SetIntField(env, lpObject, MENUITEMINFOFc.dwItemData, (jint)lpStruct->dwItemData);
-	(*env)->SetIntField(env, lpObject, MENUITEMINFOFc.dwTypeData, (jint)lpStruct->dwTypeData);
+	(*env)->SetIntLongField(env, lpObject, MENUITEMINFOFc.hSubMenu, (jintLong)lpStruct->hSubMenu);
+	(*env)->SetIntLongField(env, lpObject, MENUITEMINFOFc.hbmpChecked, (jintLong)lpStruct->hbmpChecked);
+	(*env)->SetIntLongField(env, lpObject, MENUITEMINFOFc.hbmpUnchecked, (jintLong)lpStruct->hbmpUnchecked);
+	(*env)->SetIntLongField(env, lpObject, MENUITEMINFOFc.dwItemData, (jintLong)lpStruct->dwItemData);
+	(*env)->SetIntLongField(env, lpObject, MENUITEMINFOFc.dwTypeData, (jintLong)lpStruct->dwTypeData);
 	(*env)->SetIntField(env, lpObject, MENUITEMINFOFc.cch, (jint)lpStruct->cch);
 #ifndef _WIN32_WCE
-	(*env)->SetIntField(env, lpObject, MENUITEMINFOFc.hbmpItem, (jint)lpStruct->hbmpItem);
+	(*env)->SetIntLongField(env, lpObject, MENUITEMINFOFc.hbmpItem, (jintLong)lpStruct->hbmpItem);
 #endif
 }
 #endif
@@ -2842,7 +2842,7 @@ void cacheMOUSEINPUTFields(JNIEnv *env, jobject lpObject)
 	MOUSEINPUTFc.mouseData = (*env)->GetFieldID(env, MOUSEINPUTFc.clazz, "mouseData", "I");
 	MOUSEINPUTFc.dwFlags = (*env)->GetFieldID(env, MOUSEINPUTFc.clazz, "dwFlags", "I");
 	MOUSEINPUTFc.time = (*env)->GetFieldID(env, MOUSEINPUTFc.clazz, "time", "I");
-	MOUSEINPUTFc.dwExtraInfo = (*env)->GetFieldID(env, MOUSEINPUTFc.clazz, "dwExtraInfo", "I");
+	MOUSEINPUTFc.dwExtraInfo = (*env)->GetFieldID(env, MOUSEINPUTFc.clazz, "dwExtraInfo", I_J);
 	MOUSEINPUTFc.cached = 1;
 }
 
@@ -2854,7 +2854,7 @@ MOUSEINPUT *getMOUSEINPUTFields(JNIEnv *env, jobject lpObject, MOUSEINPUT *lpStr
 	lpStruct->mouseData = (*env)->GetIntField(env, lpObject, MOUSEINPUTFc.mouseData);
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, MOUSEINPUTFc.dwFlags);
 	lpStruct->time = (*env)->GetIntField(env, lpObject, MOUSEINPUTFc.time);
-	lpStruct->dwExtraInfo = (*env)->GetIntField(env, lpObject, MOUSEINPUTFc.dwExtraInfo);
+	lpStruct->dwExtraInfo = (*env)->GetIntLongField(env, lpObject, MOUSEINPUTFc.dwExtraInfo);
 	return lpStruct;
 }
 
@@ -2866,7 +2866,7 @@ void setMOUSEINPUTFields(JNIEnv *env, jobject lpObject, MOUSEINPUT *lpStruct)
 	(*env)->SetIntField(env, lpObject, MOUSEINPUTFc.mouseData, (jint)lpStruct->mouseData);
 	(*env)->SetIntField(env, lpObject, MOUSEINPUTFc.dwFlags, (jint)lpStruct->dwFlags);
 	(*env)->SetIntField(env, lpObject, MOUSEINPUTFc.time, (jint)lpStruct->time);
-	(*env)->SetIntField(env, lpObject, MOUSEINPUTFc.dwExtraInfo, (jint)lpStruct->dwExtraInfo);
+	(*env)->SetIntLongField(env, lpObject, MOUSEINPUTFc.dwExtraInfo, (jintLong)lpStruct->dwExtraInfo);
 }
 #endif
 
@@ -2883,10 +2883,10 @@ void cacheMSGFields(JNIEnv *env, jobject lpObject)
 {
 	if (MSGFc.cached) return;
 	MSGFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	MSGFc.hwnd = (*env)->GetFieldID(env, MSGFc.clazz, "hwnd", "I");
+	MSGFc.hwnd = (*env)->GetFieldID(env, MSGFc.clazz, "hwnd", I_J);
 	MSGFc.message = (*env)->GetFieldID(env, MSGFc.clazz, "message", "I");
-	MSGFc.wParam = (*env)->GetFieldID(env, MSGFc.clazz, "wParam", "I");
-	MSGFc.lParam = (*env)->GetFieldID(env, MSGFc.clazz, "lParam", "I");
+	MSGFc.wParam = (*env)->GetFieldID(env, MSGFc.clazz, "wParam", I_J);
+	MSGFc.lParam = (*env)->GetFieldID(env, MSGFc.clazz, "lParam", I_J);
 	MSGFc.time = (*env)->GetFieldID(env, MSGFc.clazz, "time", "I");
 	MSGFc.x = (*env)->GetFieldID(env, MSGFc.clazz, "x", "I");
 	MSGFc.y = (*env)->GetFieldID(env, MSGFc.clazz, "y", "I");
@@ -2896,10 +2896,10 @@ void cacheMSGFields(JNIEnv *env, jobject lpObject)
 MSG *getMSGFields(JNIEnv *env, jobject lpObject, MSG *lpStruct)
 {
 	if (!MSGFc.cached) cacheMSGFields(env, lpObject);
-	lpStruct->hwnd = (HWND)(*env)->GetIntField(env, lpObject, MSGFc.hwnd);
+	lpStruct->hwnd = (HWND)(*env)->GetIntLongField(env, lpObject, MSGFc.hwnd);
 	lpStruct->message = (*env)->GetIntField(env, lpObject, MSGFc.message);
-	lpStruct->wParam = (*env)->GetIntField(env, lpObject, MSGFc.wParam);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, MSGFc.lParam);
+	lpStruct->wParam = (*env)->GetIntLongField(env, lpObject, MSGFc.wParam);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, MSGFc.lParam);
 	lpStruct->time = (*env)->GetIntField(env, lpObject, MSGFc.time);
 	lpStruct->pt.x = (*env)->GetIntField(env, lpObject, MSGFc.x);
 	lpStruct->pt.y = (*env)->GetIntField(env, lpObject, MSGFc.y);
@@ -2909,10 +2909,10 @@ MSG *getMSGFields(JNIEnv *env, jobject lpObject, MSG *lpStruct)
 void setMSGFields(JNIEnv *env, jobject lpObject, MSG *lpStruct)
 {
 	if (!MSGFc.cached) cacheMSGFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, MSGFc.hwnd, (jint)lpStruct->hwnd);
+	(*env)->SetIntLongField(env, lpObject, MSGFc.hwnd, (jintLong)lpStruct->hwnd);
 	(*env)->SetIntField(env, lpObject, MSGFc.message, (jint)lpStruct->message);
-	(*env)->SetIntField(env, lpObject, MSGFc.wParam, (jint)lpStruct->wParam);
-	(*env)->SetIntField(env, lpObject, MSGFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, MSGFc.wParam, (jintLong)lpStruct->wParam);
+	(*env)->SetIntLongField(env, lpObject, MSGFc.lParam, (jintLong)lpStruct->lParam);
 	(*env)->SetIntField(env, lpObject, MSGFc.time, (jint)lpStruct->time);
 	(*env)->SetIntField(env, lpObject, MSGFc.x, (jint)lpStruct->pt.x);
 	(*env)->SetIntField(env, lpObject, MSGFc.y, (jint)lpStruct->pt.y);
@@ -2934,14 +2934,14 @@ void cacheNMCUSTOMDRAWFields(JNIEnv *env, jobject lpObject)
 	cacheNMHDRFields(env, lpObject);
 	NMCUSTOMDRAWFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	NMCUSTOMDRAWFc.dwDrawStage = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "dwDrawStage", "I");
-	NMCUSTOMDRAWFc.hdc = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "hdc", "I");
+	NMCUSTOMDRAWFc.hdc = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "hdc", I_J);
 	NMCUSTOMDRAWFc.left = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "left", "I");
 	NMCUSTOMDRAWFc.top = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "top", "I");
 	NMCUSTOMDRAWFc.right = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "right", "I");
 	NMCUSTOMDRAWFc.bottom = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "bottom", "I");
-	NMCUSTOMDRAWFc.dwItemSpec = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "dwItemSpec", "I");
+	NMCUSTOMDRAWFc.dwItemSpec = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "dwItemSpec", I_J);
 	NMCUSTOMDRAWFc.uItemState = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "uItemState", "I");
-	NMCUSTOMDRAWFc.lItemlParam = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "lItemlParam", "I");
+	NMCUSTOMDRAWFc.lItemlParam = (*env)->GetFieldID(env, NMCUSTOMDRAWFc.clazz, "lItemlParam", I_J);
 	NMCUSTOMDRAWFc.cached = 1;
 }
 
@@ -2950,14 +2950,14 @@ NMCUSTOMDRAW *getNMCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMCUSTOMDRAW
 	if (!NMCUSTOMDRAWFc.cached) cacheNMCUSTOMDRAWFields(env, lpObject);
 	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	lpStruct->dwDrawStage = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.dwDrawStage);
-	lpStruct->hdc = (HDC)(*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.hdc);
+	lpStruct->hdc = (HDC)(*env)->GetIntLongField(env, lpObject, NMCUSTOMDRAWFc.hdc);
 	lpStruct->rc.left = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.left);
 	lpStruct->rc.top = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.top);
 	lpStruct->rc.right = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.right);
 	lpStruct->rc.bottom = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.bottom);
-	lpStruct->dwItemSpec = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.dwItemSpec);
+	lpStruct->dwItemSpec = (*env)->GetIntLongField(env, lpObject, NMCUSTOMDRAWFc.dwItemSpec);
 	lpStruct->uItemState = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.uItemState);
-	lpStruct->lItemlParam = (*env)->GetIntField(env, lpObject, NMCUSTOMDRAWFc.lItemlParam);
+	lpStruct->lItemlParam = (*env)->GetIntLongField(env, lpObject, NMCUSTOMDRAWFc.lItemlParam);
 	return lpStruct;
 }
 
@@ -2966,14 +2966,14 @@ void setNMCUSTOMDRAWFields(JNIEnv *env, jobject lpObject, NMCUSTOMDRAW *lpStruct
 	if (!NMCUSTOMDRAWFc.cached) cacheNMCUSTOMDRAWFields(env, lpObject);
 	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	(*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.dwDrawStage, (jint)lpStruct->dwDrawStage);
-	(*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.hdc, (jint)lpStruct->hdc);
+	(*env)->SetIntLongField(env, lpObject, NMCUSTOMDRAWFc.hdc, (jintLong)lpStruct->hdc);
 	(*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.left, (jint)lpStruct->rc.left);
 	(*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.top, (jint)lpStruct->rc.top);
 	(*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.right, (jint)lpStruct->rc.right);
 	(*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.bottom, (jint)lpStruct->rc.bottom);
-	(*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.dwItemSpec, (jint)lpStruct->dwItemSpec);
+	(*env)->SetIntLongField(env, lpObject, NMCUSTOMDRAWFc.dwItemSpec, (jintLong)lpStruct->dwItemSpec);
 	(*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.uItemState, (jint)lpStruct->uItemState);
-	(*env)->SetIntField(env, lpObject, NMCUSTOMDRAWFc.lItemlParam, (jint)lpStruct->lItemlParam);
+	(*env)->SetIntLongField(env, lpObject, NMCUSTOMDRAWFc.lItemlParam, (jintLong)lpStruct->lItemlParam);
 }
 #endif
 
@@ -2990,8 +2990,8 @@ void cacheNMHDRFields(JNIEnv *env, jobject lpObject)
 {
 	if (NMHDRFc.cached) return;
 	NMHDRFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NMHDRFc.hwndFrom = (*env)->GetFieldID(env, NMHDRFc.clazz, "hwndFrom", "I");
-	NMHDRFc.idFrom = (*env)->GetFieldID(env, NMHDRFc.clazz, "idFrom", "I");
+	NMHDRFc.hwndFrom = (*env)->GetFieldID(env, NMHDRFc.clazz, "hwndFrom", I_J);
+	NMHDRFc.idFrom = (*env)->GetFieldID(env, NMHDRFc.clazz, "idFrom", I_J);
 	NMHDRFc.code = (*env)->GetFieldID(env, NMHDRFc.clazz, "code", "I");
 	NMHDRFc.cached = 1;
 }
@@ -2999,8 +2999,8 @@ void cacheNMHDRFields(JNIEnv *env, jobject lpObject)
 NMHDR *getNMHDRFields(JNIEnv *env, jobject lpObject, NMHDR *lpStruct)
 {
 	if (!NMHDRFc.cached) cacheNMHDRFields(env, lpObject);
-	lpStruct->hwndFrom = (HWND)(*env)->GetIntField(env, lpObject, NMHDRFc.hwndFrom);
-	lpStruct->idFrom = (*env)->GetIntField(env, lpObject, NMHDRFc.idFrom);
+	lpStruct->hwndFrom = (HWND)(*env)->GetIntLongField(env, lpObject, NMHDRFc.hwndFrom);
+	lpStruct->idFrom = (*env)->GetIntLongField(env, lpObject, NMHDRFc.idFrom);
 	lpStruct->code = (*env)->GetIntField(env, lpObject, NMHDRFc.code);
 	return lpStruct;
 }
@@ -3008,8 +3008,8 @@ NMHDR *getNMHDRFields(JNIEnv *env, jobject lpObject, NMHDR *lpStruct)
 void setNMHDRFields(JNIEnv *env, jobject lpObject, NMHDR *lpStruct)
 {
 	if (!NMHDRFc.cached) cacheNMHDRFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, NMHDRFc.hwndFrom, (jint)lpStruct->hwndFrom);
-	(*env)->SetIntField(env, lpObject, NMHDRFc.idFrom, (jint)lpStruct->idFrom);
+	(*env)->SetIntLongField(env, lpObject, NMHDRFc.hwndFrom, (jintLong)lpStruct->hwndFrom);
+	(*env)->SetIntLongField(env, lpObject, NMHDRFc.idFrom, (jintLong)lpStruct->idFrom);
 	(*env)->SetIntField(env, lpObject, NMHDRFc.code, (jint)lpStruct->code);
 }
 #endif
@@ -3030,7 +3030,7 @@ void cacheNMHEADERFields(JNIEnv *env, jobject lpObject)
 	NMHEADERFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	NMHEADERFc.iItem = (*env)->GetFieldID(env, NMHEADERFc.clazz, "iItem", "I");
 	NMHEADERFc.iButton = (*env)->GetFieldID(env, NMHEADERFc.clazz, "iButton", "I");
-	NMHEADERFc.pitem = (*env)->GetFieldID(env, NMHEADERFc.clazz, "pitem", "I");
+	NMHEADERFc.pitem = (*env)->GetFieldID(env, NMHEADERFc.clazz, "pitem", I_J);
 	NMHEADERFc.cached = 1;
 }
 
@@ -3040,7 +3040,7 @@ NMHEADER *getNMHEADERFields(JNIEnv *env, jobject lpObject, NMHEADER *lpStruct)
 	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	lpStruct->iItem = (*env)->GetIntField(env, lpObject, NMHEADERFc.iItem);
 	lpStruct->iButton = (*env)->GetIntField(env, lpObject, NMHEADERFc.iButton);
-	lpStruct->pitem = (HDITEM FAR *)(*env)->GetIntField(env, lpObject, NMHEADERFc.pitem);
+	lpStruct->pitem = (HDITEM FAR *)(*env)->GetIntLongField(env, lpObject, NMHEADERFc.pitem);
 	return lpStruct;
 }
 
@@ -3050,7 +3050,7 @@ void setNMHEADERFields(JNIEnv *env, jobject lpObject, NMHEADER *lpStruct)
 	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	(*env)->SetIntField(env, lpObject, NMHEADERFc.iItem, (jint)lpStruct->iItem);
 	(*env)->SetIntField(env, lpObject, NMHEADERFc.iButton, (jint)lpStruct->iButton);
-	(*env)->SetIntField(env, lpObject, NMHEADERFc.pitem, (jint)lpStruct->pitem);
+	(*env)->SetIntLongField(env, lpObject, NMHEADERFc.pitem, (jintLong)lpStruct->pitem);
 }
 #endif
 
@@ -3087,11 +3087,11 @@ NMLINK *getNMLINKFields(JNIEnv *env, jobject lpObject, NMLINK *lpStruct)
 	lpStruct->item.stateMask = (*env)->GetIntField(env, lpObject, NMLINKFc.stateMask);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NMLINKFc.szID);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->item.szID) / 2, (jchar *)lpStruct->item.szID);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->item.szID) / sizeof(jchar), (jchar *)lpStruct->item.szID);
 	}
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NMLINKFc.szUrl);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->item.szUrl) / 2, (jchar *)lpStruct->item.szUrl);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->item.szUrl) / sizeof(jchar), (jchar *)lpStruct->item.szUrl);
 	}
 	return lpStruct;
 }
@@ -3106,11 +3106,11 @@ void setNMLINKFields(JNIEnv *env, jobject lpObject, NMLINK *lpStruct)
 	(*env)->SetIntField(env, lpObject, NMLINKFc.stateMask, (jint)lpStruct->item.stateMask);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NMLINKFc.szID);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->item.szID) / 2, (jchar *)lpStruct->item.szID);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->item.szID) / sizeof(jchar), (jchar *)lpStruct->item.szID);
 	}
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NMLINKFc.szUrl);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->item.szUrl) / 2, (jchar *)lpStruct->item.szUrl);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->item.szUrl) / sizeof(jchar), (jchar *)lpStruct->item.szUrl);
 	}
 }
 #endif
@@ -3136,7 +3136,7 @@ void cacheNMLISTVIEWFields(JNIEnv *env, jobject lpObject)
 	NMLISTVIEWFc.uChanged = (*env)->GetFieldID(env, NMLISTVIEWFc.clazz, "uChanged", "I");
 	NMLISTVIEWFc.x = (*env)->GetFieldID(env, NMLISTVIEWFc.clazz, "x", "I");
 	NMLISTVIEWFc.y = (*env)->GetFieldID(env, NMLISTVIEWFc.clazz, "y", "I");
-	NMLISTVIEWFc.lParam = (*env)->GetFieldID(env, NMLISTVIEWFc.clazz, "lParam", "I");
+	NMLISTVIEWFc.lParam = (*env)->GetFieldID(env, NMLISTVIEWFc.clazz, "lParam", I_J);
 	NMLISTVIEWFc.cached = 1;
 }
 
@@ -3151,7 +3151,7 @@ NMLISTVIEW *getNMLISTVIEWFields(JNIEnv *env, jobject lpObject, NMLISTVIEW *lpStr
 	lpStruct->uChanged = (*env)->GetIntField(env, lpObject, NMLISTVIEWFc.uChanged);
 	lpStruct->ptAction.x = (*env)->GetIntField(env, lpObject, NMLISTVIEWFc.x);
 	lpStruct->ptAction.y = (*env)->GetIntField(env, lpObject, NMLISTVIEWFc.y);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, NMLISTVIEWFc.lParam);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMLISTVIEWFc.lParam);
 	return lpStruct;
 }
 
@@ -3166,7 +3166,7 @@ void setNMLISTVIEWFields(JNIEnv *env, jobject lpObject, NMLISTVIEW *lpStruct)
 	(*env)->SetIntField(env, lpObject, NMLISTVIEWFc.uChanged, (jint)lpStruct->uChanged);
 	(*env)->SetIntField(env, lpObject, NMLISTVIEWFc.x, (jint)lpStruct->ptAction.x);
 	(*env)->SetIntField(env, lpObject, NMLISTVIEWFc.y, (jint)lpStruct->ptAction.y);
-	(*env)->SetIntField(env, lpObject, NMLISTVIEWFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, NMLISTVIEWFc.lParam, (jintLong)lpStruct->lParam);
 }
 #endif
 
@@ -3306,14 +3306,14 @@ void cacheNMLVDISPINFOFields(JNIEnv *env, jobject lpObject)
 	NMLVDISPINFOFc.iSubItem = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "iSubItem", "I");
 	NMLVDISPINFOFc.state = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "state", "I");
 	NMLVDISPINFOFc.stateMask = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "stateMask", "I");
-	NMLVDISPINFOFc.pszText = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "pszText", "I");
+	NMLVDISPINFOFc.pszText = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "pszText", I_J);
 	NMLVDISPINFOFc.cchTextMax = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "cchTextMax", "I");
 	NMLVDISPINFOFc.iImage = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "iImage", "I");
-	NMLVDISPINFOFc.lParam = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "lParam", "I");
+	NMLVDISPINFOFc.lParam = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "lParam", I_J);
 	NMLVDISPINFOFc.iIndent = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "iIndent", "I");
 	NMLVDISPINFOFc.iGroupId = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "iGroupId", "I");
 	NMLVDISPINFOFc.cColumns = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "cColumns", "I");
-	NMLVDISPINFOFc.puColumns = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "puColumns", "I");
+	NMLVDISPINFOFc.puColumns = (*env)->GetFieldID(env, NMLVDISPINFOFc.clazz, "puColumns", I_J);
 	NMLVDISPINFOFc.cached = 1;
 }
 
@@ -3326,10 +3326,10 @@ NMLVDISPINFO *getNMLVDISPINFOFields(JNIEnv *env, jobject lpObject, NMLVDISPINFO
 	lpStruct->item.iSubItem = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.iSubItem);
 	lpStruct->item.state = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.state);
 	lpStruct->item.stateMask = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.stateMask);
-	lpStruct->item.pszText = (LPTSTR)(*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.pszText);
+	lpStruct->item.pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, NMLVDISPINFOFc.pszText);
 	lpStruct->item.cchTextMax = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.cchTextMax);
 	lpStruct->item.iImage = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.iImage);
-	lpStruct->item.lParam = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.lParam);
+	lpStruct->item.lParam = (*env)->GetIntLongField(env, lpObject, NMLVDISPINFOFc.lParam);
 	lpStruct->item.iIndent = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.iIndent);
 #ifndef _WIN32_WCE
 	lpStruct->item.iGroupId = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.iGroupId);
@@ -3338,7 +3338,7 @@ NMLVDISPINFO *getNMLVDISPINFOFields(JNIEnv *env, jobject lpObject, NMLVDISPINFO
 	lpStruct->item.cColumns = (*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.cColumns);
 #endif
 #ifndef _WIN32_WCE
-	lpStruct->item.puColumns = (PUINT)(*env)->GetIntField(env, lpObject, NMLVDISPINFOFc.puColumns);
+	lpStruct->item.puColumns = (PUINT)(*env)->GetIntLongField(env, lpObject, NMLVDISPINFOFc.puColumns);
 #endif
 	return lpStruct;
 }
@@ -3352,10 +3352,10 @@ void setNMLVDISPINFOFields(JNIEnv *env, jobject lpObject, NMLVDISPINFO *lpStruct
 	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.iSubItem, (jint)lpStruct->item.iSubItem);
 	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.state, (jint)lpStruct->item.state);
 	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.stateMask, (jint)lpStruct->item.stateMask);
-	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.pszText, (jint)lpStruct->item.pszText);
+	(*env)->SetIntLongField(env, lpObject, NMLVDISPINFOFc.pszText, (jintLong)lpStruct->item.pszText);
 	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.cchTextMax, (jint)lpStruct->item.cchTextMax);
 	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.iImage, (jint)lpStruct->item.iImage);
-	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.lParam, (jint)lpStruct->item.lParam);
+	(*env)->SetIntLongField(env, lpObject, NMLVDISPINFOFc.lParam, (jintLong)lpStruct->item.lParam);
 	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.iIndent, (jint)lpStruct->item.iIndent);
 #ifndef _WIN32_WCE
 	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.iGroupId, (jint)lpStruct->item.iGroupId);
@@ -3364,7 +3364,7 @@ void setNMLVDISPINFOFields(JNIEnv *env, jobject lpObject, NMLVDISPINFO *lpStruct
 	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.cColumns, (jint)lpStruct->item.cColumns);
 #endif
 #ifndef _WIN32_WCE
-	(*env)->SetIntField(env, lpObject, NMLVDISPINFOFc.puColumns, (jint)lpStruct->item.puColumns);
+	(*env)->SetIntLongField(env, lpObject, NMLVDISPINFOFc.puColumns, (jintLong)lpStruct->item.puColumns);
 #endif
 }
 #endif
@@ -3385,8 +3385,8 @@ void cacheNMLVFINDITEMFields(JNIEnv *env, jobject lpObject)
 	NMLVFINDITEMFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	NMLVFINDITEMFc.iStart = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "iStart", "I");
 	NMLVFINDITEMFc.flags = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "flags", "I");
-	NMLVFINDITEMFc.psz = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "psz", "I");
-	NMLVFINDITEMFc.lParam = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "lParam", "I");
+	NMLVFINDITEMFc.psz = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "psz", I_J);
+	NMLVFINDITEMFc.lParam = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "lParam", I_J);
 	NMLVFINDITEMFc.x = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "x", "I");
 	NMLVFINDITEMFc.y = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "y", "I");
 	NMLVFINDITEMFc.vkDirection = (*env)->GetFieldID(env, NMLVFINDITEMFc.clazz, "vkDirection", "I");
@@ -3399,8 +3399,8 @@ NMLVFINDITEM *getNMLVFINDITEMFields(JNIEnv *env, jobject lpObject, NMLVFINDITEM
 	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	lpStruct->iStart = (*env)->GetIntField(env, lpObject, NMLVFINDITEMFc.iStart);
 	lpStruct->lvfi.flags = (*env)->GetIntField(env, lpObject, NMLVFINDITEMFc.flags);
-	lpStruct->lvfi.psz = (LPCTSTR)(*env)->GetIntField(env, lpObject, NMLVFINDITEMFc.psz);
-	lpStruct->lvfi.lParam = (*env)->GetIntField(env, lpObject, NMLVFINDITEMFc.lParam);
+	lpStruct->lvfi.psz = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, NMLVFINDITEMFc.psz);
+	lpStruct->lvfi.lParam = (*env)->GetIntLongField(env, lpObject, NMLVFINDITEMFc.lParam);
 	lpStruct->lvfi.pt.x = (*env)->GetIntField(env, lpObject, NMLVFINDITEMFc.x);
 	lpStruct->lvfi.pt.y = (*env)->GetIntField(env, lpObject, NMLVFINDITEMFc.y);
 	lpStruct->lvfi.vkDirection = (*env)->GetIntField(env, lpObject, NMLVFINDITEMFc.vkDirection);
@@ -3413,8 +3413,8 @@ void setNMLVFINDITEMFields(JNIEnv *env, jobject lpObject, NMLVFINDITEM *lpStruct
 	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	(*env)->SetIntField(env, lpObject, NMLVFINDITEMFc.iStart, (jint)lpStruct->iStart);
 	(*env)->SetIntField(env, lpObject, NMLVFINDITEMFc.flags, (jint)lpStruct->lvfi.flags);
-	(*env)->SetIntField(env, lpObject, NMLVFINDITEMFc.psz, (jint)lpStruct->lvfi.psz);
-	(*env)->SetIntField(env, lpObject, NMLVFINDITEMFc.lParam, (jint)lpStruct->lvfi.lParam);
+	(*env)->SetIntLongField(env, lpObject, NMLVFINDITEMFc.psz, (jintLong)lpStruct->lvfi.psz);
+	(*env)->SetIntLongField(env, lpObject, NMLVFINDITEMFc.lParam, (jintLong)lpStruct->lvfi.lParam);
 	(*env)->SetIntField(env, lpObject, NMLVFINDITEMFc.x, (jint)lpStruct->lvfi.pt.x);
 	(*env)->SetIntField(env, lpObject, NMLVFINDITEMFc.y, (jint)lpStruct->lvfi.pt.y);
 	(*env)->SetIntField(env, lpObject, NMLVFINDITEMFc.vkDirection, (jint)lpStruct->lvfi.vkDirection);
@@ -3480,12 +3480,12 @@ void cacheNMREBARCHEVRONFields(JNIEnv *env, jobject lpObject)
 	NMREBARCHEVRONFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	NMREBARCHEVRONFc.uBand = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "uBand", "I");
 	NMREBARCHEVRONFc.wID = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "wID", "I");
-	NMREBARCHEVRONFc.lParam = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "lParam", "I");
+	NMREBARCHEVRONFc.lParam = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "lParam", I_J);
 	NMREBARCHEVRONFc.left = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "left", "I");
 	NMREBARCHEVRONFc.top = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "top", "I");
 	NMREBARCHEVRONFc.right = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "right", "I");
 	NMREBARCHEVRONFc.bottom = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "bottom", "I");
-	NMREBARCHEVRONFc.lParamNM = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "lParamNM", "I");
+	NMREBARCHEVRONFc.lParamNM = (*env)->GetFieldID(env, NMREBARCHEVRONFc.clazz, "lParamNM", I_J);
 	NMREBARCHEVRONFc.cached = 1;
 }
 
@@ -3495,12 +3495,12 @@ NMREBARCHEVRON *getNMREBARCHEVRONFields(JNIEnv *env, jobject lpObject, NMREBARCH
 	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	lpStruct->uBand = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.uBand);
 	lpStruct->wID = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.wID);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.lParam);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMREBARCHEVRONFc.lParam);
 	lpStruct->rc.left = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.left);
 	lpStruct->rc.top = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.top);
 	lpStruct->rc.right = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.right);
 	lpStruct->rc.bottom = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.bottom);
-	lpStruct->lParamNM = (*env)->GetIntField(env, lpObject, NMREBARCHEVRONFc.lParamNM);
+	lpStruct->lParamNM = (*env)->GetIntLongField(env, lpObject, NMREBARCHEVRONFc.lParamNM);
 	return lpStruct;
 }
 
@@ -3510,12 +3510,12 @@ void setNMREBARCHEVRONFields(JNIEnv *env, jobject lpObject, NMREBARCHEVRON *lpSt
 	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	(*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.uBand, (jint)lpStruct->uBand);
 	(*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.wID, (jint)lpStruct->wID);
-	(*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, NMREBARCHEVRONFc.lParam, (jintLong)lpStruct->lParam);
 	(*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.left, (jint)lpStruct->rc.left);
 	(*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.top, (jint)lpStruct->rc.top);
 	(*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.right, (jint)lpStruct->rc.right);
 	(*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.bottom, (jint)lpStruct->rc.bottom);
-	(*env)->SetIntField(env, lpObject, NMREBARCHEVRONFc.lParamNM, (jint)lpStruct->lParamNM);
+	(*env)->SetIntLongField(env, lpObject, NMREBARCHEVRONFc.lParamNM, (jintLong)lpStruct->lParamNM);
 }
 #endif
 
@@ -3679,10 +3679,10 @@ void cacheNMTOOLBARFields(JNIEnv *env, jobject lpObject)
 	NMTOOLBARFc.idCommand = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "idCommand", "I");
 	NMTOOLBARFc.fsState = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "fsState", "B");
 	NMTOOLBARFc.fsStyle = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "fsStyle", "B");
-	NMTOOLBARFc.dwData = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "dwData", "I");
-	NMTOOLBARFc.iString = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "iString", "I");
+	NMTOOLBARFc.dwData = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "dwData", I_J);
+	NMTOOLBARFc.iString = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "iString", I_J);
 	NMTOOLBARFc.cchText = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "cchText", "I");
-	NMTOOLBARFc.pszText = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "pszText", "I");
+	NMTOOLBARFc.pszText = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "pszText", I_J);
 	NMTOOLBARFc.left = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "left", "I");
 	NMTOOLBARFc.top = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "top", "I");
 	NMTOOLBARFc.right = (*env)->GetFieldID(env, NMTOOLBARFc.clazz, "right", "I");
@@ -3699,10 +3699,10 @@ NMTOOLBAR *getNMTOOLBARFields(JNIEnv *env, jobject lpObject, NMTOOLBAR *lpStruct
 	lpStruct->tbButton.idCommand = (*env)->GetIntField(env, lpObject, NMTOOLBARFc.idCommand);
 	lpStruct->tbButton.fsState = (*env)->GetByteField(env, lpObject, NMTOOLBARFc.fsState);
 	lpStruct->tbButton.fsStyle = (*env)->GetByteField(env, lpObject, NMTOOLBARFc.fsStyle);
-	lpStruct->tbButton.dwData = (*env)->GetIntField(env, lpObject, NMTOOLBARFc.dwData);
-	lpStruct->tbButton.iString = (*env)->GetIntField(env, lpObject, NMTOOLBARFc.iString);
+	lpStruct->tbButton.dwData = (*env)->GetIntLongField(env, lpObject, NMTOOLBARFc.dwData);
+	lpStruct->tbButton.iString = (*env)->GetIntLongField(env, lpObject, NMTOOLBARFc.iString);
 	lpStruct->cchText = (*env)->GetIntField(env, lpObject, NMTOOLBARFc.cchText);
-	lpStruct->pszText = (LPTSTR)(*env)->GetIntField(env, lpObject, NMTOOLBARFc.pszText);
+	lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, NMTOOLBARFc.pszText);
 #ifndef _WIN32_WCE
 	lpStruct->rcButton.left = (*env)->GetIntField(env, lpObject, NMTOOLBARFc.left);
 #endif
@@ -3727,10 +3727,10 @@ void setNMTOOLBARFields(JNIEnv *env, jobject lpObject, NMTOOLBAR *lpStruct)
 	(*env)->SetIntField(env, lpObject, NMTOOLBARFc.idCommand, (jint)lpStruct->tbButton.idCommand);
 	(*env)->SetByteField(env, lpObject, NMTOOLBARFc.fsState, (jbyte)lpStruct->tbButton.fsState);
 	(*env)->SetByteField(env, lpObject, NMTOOLBARFc.fsStyle, (jbyte)lpStruct->tbButton.fsStyle);
-	(*env)->SetIntField(env, lpObject, NMTOOLBARFc.dwData, (jint)lpStruct->tbButton.dwData);
-	(*env)->SetIntField(env, lpObject, NMTOOLBARFc.iString, (jint)lpStruct->tbButton.iString);
+	(*env)->SetIntLongField(env, lpObject, NMTOOLBARFc.dwData, (jintLong)lpStruct->tbButton.dwData);
+	(*env)->SetIntLongField(env, lpObject, NMTOOLBARFc.iString, (jintLong)lpStruct->tbButton.iString);
 	(*env)->SetIntField(env, lpObject, NMTOOLBARFc.cchText, (jint)lpStruct->cchText);
-	(*env)->SetIntField(env, lpObject, NMTOOLBARFc.pszText, (jint)lpStruct->pszText);
+	(*env)->SetIntLongField(env, lpObject, NMTOOLBARFc.pszText, (jintLong)lpStruct->pszText);
 #ifndef _WIN32_WCE
 	(*env)->SetIntField(env, lpObject, NMTOOLBARFc.left, (jint)lpStruct->rcButton.left);
 #endif
@@ -3861,10 +3861,10 @@ void cacheNMTTDISPINFOFields(JNIEnv *env, jobject lpObject)
 	if (NMTTDISPINFOFc.cached) return;
 	cacheNMHDRFields(env, lpObject);
 	NMTTDISPINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NMTTDISPINFOFc.lpszText = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "lpszText", "I");
-	NMTTDISPINFOFc.hinst = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "hinst", "I");
+	NMTTDISPINFOFc.lpszText = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "lpszText", I_J);
+	NMTTDISPINFOFc.hinst = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "hinst", I_J);
 	NMTTDISPINFOFc.uFlags = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "uFlags", "I");
-	NMTTDISPINFOFc.lParam = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "lParam", "I");
+	NMTTDISPINFOFc.lParam = (*env)->GetFieldID(env, NMTTDISPINFOFc.clazz, "lParam", I_J);
 	NMTTDISPINFOFc.cached = 1;
 }
 
@@ -3872,10 +3872,10 @@ NMTTDISPINFO *getNMTTDISPINFOFields(JNIEnv *env, jobject lpObject, NMTTDISPINFO
 {
 	if (!NMTTDISPINFOFc.cached) cacheNMTTDISPINFOFields(env, lpObject);
 	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
-	lpStruct->lpszText = (void *)(*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.lpszText);
-	lpStruct->hinst = (HINSTANCE)(*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.hinst);
+	lpStruct->lpszText = (void *)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText);
+	lpStruct->hinst = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst);
 	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.uFlags);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.lParam);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam);
 	return lpStruct;
 }
 
@@ -3883,10 +3883,10 @@ void setNMTTDISPINFOFields(JNIEnv *env, jobject lpObject, NMTTDISPINFO *lpStruct
 {
 	if (!NMTTDISPINFOFc.cached) cacheNMTTDISPINFOFields(env, lpObject);
 	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
-	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.lpszText, (jint)lpStruct->lpszText);
-	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.hinst, (jint)lpStruct->hinst);
+	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText, (jintLong)lpStruct->lpszText);
+	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst, (jintLong)lpStruct->hinst);
 	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.uFlags, (jint)lpStruct->uFlags);
-	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam, (jintLong)lpStruct->lParam);
 }
 #endif
 
@@ -3912,10 +3912,10 @@ NMTTDISPINFOA *getNMTTDISPINFOAFields(JNIEnv *env, jobject lpObject, NMTTDISPINF
 {
 	if (!NMTTDISPINFOAFc.cached) cacheNMTTDISPINFOAFields(env, lpObject);
 	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
-	lpStruct->lpszText = (void *)(*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.lpszText);
-	lpStruct->hinst = (HINSTANCE)(*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.hinst);
+	lpStruct->lpszText = (void *)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText);
+	lpStruct->hinst = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst);
 	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.uFlags);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.lParam);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam);
 	{
 	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, NMTTDISPINFOAFc.szText);
 	(*env)->GetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText), (jbyte *)lpStruct->szText);
@@ -3927,10 +3927,10 @@ void setNMTTDISPINFOAFields(JNIEnv *env, jobject lpObject, NMTTDISPINFOA *lpStru
 {
 	if (!NMTTDISPINFOAFc.cached) cacheNMTTDISPINFOAFields(env, lpObject);
 	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
-	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.lpszText, (jint)lpStruct->lpszText);
-	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.hinst, (jint)lpStruct->hinst);
+	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText, (jintLong)lpStruct->lpszText);
+	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst, (jintLong)lpStruct->hinst);
 	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.uFlags, (jint)lpStruct->uFlags);
-	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam, (jintLong)lpStruct->lParam);
 	{
 	jbyteArray lpObject1 = (jbyteArray)(*env)->GetObjectField(env, lpObject, NMTTDISPINFOAFc.szText);
 	(*env)->SetByteArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText), (jbyte *)lpStruct->szText);
@@ -3960,13 +3960,13 @@ NMTTDISPINFOW *getNMTTDISPINFOWFields(JNIEnv *env, jobject lpObject, NMTTDISPINF
 {
 	if (!NMTTDISPINFOWFc.cached) cacheNMTTDISPINFOWFields(env, lpObject);
 	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
-	lpStruct->lpszText = (void *)(*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.lpszText);
-	lpStruct->hinst = (HINSTANCE)(*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.hinst);
+	lpStruct->lpszText = (void *)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText);
+	lpStruct->hinst = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst);
 	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.uFlags);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, NMTTDISPINFOFc.lParam);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NMTTDISPINFOWFc.szText);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText) / 2, (jchar *)lpStruct->szText);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText) / sizeof(jchar), (jchar *)lpStruct->szText);
 	}
 	return lpStruct;
 }
@@ -3975,13 +3975,13 @@ void setNMTTDISPINFOWFields(JNIEnv *env, jobject lpObject, NMTTDISPINFOW *lpStru
 {
 	if (!NMTTDISPINFOWFc.cached) cacheNMTTDISPINFOWFields(env, lpObject);
 	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
-	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.lpszText, (jint)lpStruct->lpszText);
-	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.hinst, (jint)lpStruct->hinst);
+	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lpszText, (jintLong)lpStruct->lpszText);
+	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.hinst, (jintLong)lpStruct->hinst);
 	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.uFlags, (jint)lpStruct->uFlags);
-	(*env)->SetIntField(env, lpObject, NMTTDISPINFOFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, NMTTDISPINFOFc.lParam, (jintLong)lpStruct->lParam);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NMTTDISPINFOWFc.szText);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText) / 2, (jchar *)lpStruct->szText);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szText) / sizeof(jchar), (jchar *)lpStruct->szText);
 	}
 }
 #endif
@@ -4045,15 +4045,15 @@ void cacheNMTVDISPINFOFields(JNIEnv *env, jobject lpObject)
 	cacheNMHDRFields(env, lpObject);
 	NMTVDISPINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	NMTVDISPINFOFc.mask = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "mask", "I");
-	NMTVDISPINFOFc.hItem = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "hItem", "I");
+	NMTVDISPINFOFc.hItem = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "hItem", I_J);
 	NMTVDISPINFOFc.state = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "state", "I");
 	NMTVDISPINFOFc.stateMask = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "stateMask", "I");
-	NMTVDISPINFOFc.pszText = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "pszText", "I");
+	NMTVDISPINFOFc.pszText = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "pszText", I_J);
 	NMTVDISPINFOFc.cchTextMax = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "cchTextMax", "I");
 	NMTVDISPINFOFc.iImage = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "iImage", "I");
 	NMTVDISPINFOFc.iSelectedImage = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "iSelectedImage", "I");
 	NMTVDISPINFOFc.cChildren = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "cChildren", "I");
-	NMTVDISPINFOFc.lParam = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "lParam", "I");
+	NMTVDISPINFOFc.lParam = (*env)->GetFieldID(env, NMTVDISPINFOFc.clazz, "lParam", I_J);
 	NMTVDISPINFOFc.cached = 1;
 }
 
@@ -4062,15 +4062,15 @@ NMTVDISPINFO *getNMTVDISPINFOFields(JNIEnv *env, jobject lpObject, NMTVDISPINFO
 	if (!NMTVDISPINFOFc.cached) cacheNMTVDISPINFOFields(env, lpObject);
 	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	lpStruct->item.mask = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.mask);
-	lpStruct->item.hItem = (HTREEITEM)(*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.hItem);
+	lpStruct->item.hItem = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, NMTVDISPINFOFc.hItem);
 	lpStruct->item.state = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.state);
 	lpStruct->item.stateMask = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.stateMask);
-	lpStruct->item.pszText = (LPTSTR)(*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.pszText);
+	lpStruct->item.pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, NMTVDISPINFOFc.pszText);
 	lpStruct->item.cchTextMax = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.cchTextMax);
 	lpStruct->item.iImage = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.iImage);
 	lpStruct->item.iSelectedImage = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.iSelectedImage);
 	lpStruct->item.cChildren = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.cChildren);
-	lpStruct->item.lParam = (*env)->GetIntField(env, lpObject, NMTVDISPINFOFc.lParam);
+	lpStruct->item.lParam = (*env)->GetIntLongField(env, lpObject, NMTVDISPINFOFc.lParam);
 	return lpStruct;
 }
 
@@ -4079,15 +4079,15 @@ void setNMTVDISPINFOFields(JNIEnv *env, jobject lpObject, NMTVDISPINFO *lpStruct
 	if (!NMTVDISPINFOFc.cached) cacheNMTVDISPINFOFields(env, lpObject);
 	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	(*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.mask, (jint)lpStruct->item.mask);
-	(*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.hItem, (jint)lpStruct->item.hItem);
+	(*env)->SetIntLongField(env, lpObject, NMTVDISPINFOFc.hItem, (jintLong)lpStruct->item.hItem);
 	(*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.state, (jint)lpStruct->item.state);
 	(*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.stateMask, (jint)lpStruct->item.stateMask);
-	(*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.pszText, (jint)lpStruct->item.pszText);
+	(*env)->SetIntLongField(env, lpObject, NMTVDISPINFOFc.pszText, (jintLong)lpStruct->item.pszText);
 	(*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.cchTextMax, (jint)lpStruct->item.cchTextMax);
 	(*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.iImage, (jint)lpStruct->item.iImage);
 	(*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.iSelectedImage, (jint)lpStruct->item.iSelectedImage);
 	(*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.cChildren, (jint)lpStruct->item.cChildren);
-	(*env)->SetIntField(env, lpObject, NMTVDISPINFOFc.lParam, (jint)lpStruct->item.lParam);
+	(*env)->SetIntLongField(env, lpObject, NMTVDISPINFOFc.lParam, (jintLong)lpStruct->item.lParam);
 }
 #endif
 
@@ -4106,10 +4106,10 @@ void cacheNMTVITEMCHANGEFields(JNIEnv *env, jobject lpObject)
 	cacheNMHDRFields(env, lpObject);
 	NMTVITEMCHANGEFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	NMTVITEMCHANGEFc.uChanged = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "uChanged", "I");
-	NMTVITEMCHANGEFc.hItem = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "hItem", "I");
+	NMTVITEMCHANGEFc.hItem = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "hItem", I_J);
 	NMTVITEMCHANGEFc.uStateNew = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "uStateNew", "I");
 	NMTVITEMCHANGEFc.uStateOld = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "uStateOld", "I");
-	NMTVITEMCHANGEFc.lParam = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "lParam", "I");
+	NMTVITEMCHANGEFc.lParam = (*env)->GetFieldID(env, NMTVITEMCHANGEFc.clazz, "lParam", I_J);
 	NMTVITEMCHANGEFc.cached = 1;
 }
 
@@ -4118,10 +4118,10 @@ NMTVITEMCHANGE *getNMTVITEMCHANGEFields(JNIEnv *env, jobject lpObject, NMTVITEMC
 	if (!NMTVITEMCHANGEFc.cached) cacheNMTVITEMCHANGEFields(env, lpObject);
 	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	lpStruct->uChanged = (*env)->GetIntField(env, lpObject, NMTVITEMCHANGEFc.uChanged);
-	lpStruct->hItem = (HTREEITEM)(*env)->GetIntField(env, lpObject, NMTVITEMCHANGEFc.hItem);
+	lpStruct->hItem = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, NMTVITEMCHANGEFc.hItem);
 	lpStruct->uStateNew = (*env)->GetIntField(env, lpObject, NMTVITEMCHANGEFc.uStateNew);
 	lpStruct->uStateOld = (*env)->GetIntField(env, lpObject, NMTVITEMCHANGEFc.uStateOld);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, NMTVITEMCHANGEFc.lParam);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, NMTVITEMCHANGEFc.lParam);
 	return lpStruct;
 }
 
@@ -4130,10 +4130,10 @@ void setNMTVITEMCHANGEFields(JNIEnv *env, jobject lpObject, NMTVITEMCHANGE *lpSt
 	if (!NMTVITEMCHANGEFc.cached) cacheNMTVITEMCHANGEFields(env, lpObject);
 	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
 	(*env)->SetIntField(env, lpObject, NMTVITEMCHANGEFc.uChanged, (jint)lpStruct->uChanged);
-	(*env)->SetIntField(env, lpObject, NMTVITEMCHANGEFc.hItem, (jint)lpStruct->hItem);
+	(*env)->SetIntLongField(env, lpObject, NMTVITEMCHANGEFc.hItem, (jintLong)lpStruct->hItem);
 	(*env)->SetIntField(env, lpObject, NMTVITEMCHANGEFc.uStateNew, (jint)lpStruct->uStateNew);
 	(*env)->SetIntField(env, lpObject, NMTVITEMCHANGEFc.uStateOld, (jint)lpStruct->uStateOld);
-	(*env)->SetIntField(env, lpObject, NMTVITEMCHANGEFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, NMTVITEMCHANGEFc.lParam, (jintLong)lpStruct->lParam);
 }
 #endif
 
@@ -4434,11 +4434,11 @@ void cacheNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject)
 	if (NOTIFYICONDATAFc.cached) return;
 	NOTIFYICONDATAFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	NOTIFYICONDATAFc.cbSize = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "cbSize", "I");
-	NOTIFYICONDATAFc.hWnd = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "hWnd", "I");
+	NOTIFYICONDATAFc.hWnd = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "hWnd", I_J);
 	NOTIFYICONDATAFc.uID = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "uID", "I");
 	NOTIFYICONDATAFc.uFlags = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "uFlags", "I");
 	NOTIFYICONDATAFc.uCallbackMessage = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "uCallbackMessage", "I");
-	NOTIFYICONDATAFc.hIcon = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "hIcon", "I");
+	NOTIFYICONDATAFc.hIcon = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "hIcon", I_J);
 	NOTIFYICONDATAFc.dwState = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "dwState", "I");
 	NOTIFYICONDATAFc.dwStateMask = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "dwStateMask", "I");
 	NOTIFYICONDATAFc.uVersion = (*env)->GetFieldID(env, NOTIFYICONDATAFc.clazz, "uVersion", "I");
@@ -4450,11 +4450,11 @@ NOTIFYICONDATA *getNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject, NOTIFYICO
 {
 	if (!NOTIFYICONDATAFc.cached) cacheNOTIFYICONDATAFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize);
-	lpStruct->hWnd = (HWND)(*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.hWnd);
+	lpStruct->hWnd = (HWND)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd);
 	lpStruct->uID = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uID);
 	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags);
 	lpStruct->uCallbackMessage = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage);
-	lpStruct->hIcon = (HICON)(*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.hIcon);
+	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon);
 #ifndef _WIN32_WCE
 	lpStruct->dwState = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwState);
 #endif
@@ -4474,11 +4474,11 @@ void setNOTIFYICONDATAFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATA *lpSt
 {
 	if (!NOTIFYICONDATAFc.cached) cacheNOTIFYICONDATAFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize, (jint)lpStruct->cbSize);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.hWnd, (jint)lpStruct->hWnd);
+	(*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd, (jintLong)lpStruct->hWnd);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uID, (jint)lpStruct->uID);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags, (jint)lpStruct->uFlags);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage, (jint)lpStruct->uCallbackMessage);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.hIcon, (jint)lpStruct->hIcon);
+	(*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon, (jintLong)lpStruct->hIcon);
 #ifndef _WIN32_WCE
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwState, (jint)lpStruct->dwState);
 #endif
@@ -4518,11 +4518,11 @@ NOTIFYICONDATAA *getNOTIFYICONDATAAFields(JNIEnv *env, jobject lpObject, NOTIFYI
 {
 	if (!NOTIFYICONDATAAFc.cached) cacheNOTIFYICONDATAAFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize);
-	lpStruct->hWnd = (HWND)(*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.hWnd);
+	lpStruct->hWnd = (HWND)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd);
 	lpStruct->uID = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uID);
 	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags);
 	lpStruct->uCallbackMessage = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage);
-	lpStruct->hIcon = (HICON)(*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.hIcon);
+	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon);
 #ifndef _WIN32_WCE
 	lpStruct->dwState = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwState);
 #endif
@@ -4558,11 +4558,11 @@ void setNOTIFYICONDATAAFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATAA *lp
 {
 	if (!NOTIFYICONDATAAFc.cached) cacheNOTIFYICONDATAAFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize, (jint)lpStruct->cbSize);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.hWnd, (jint)lpStruct->hWnd);
+	(*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd, (jintLong)lpStruct->hWnd);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uID, (jint)lpStruct->uID);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags, (jint)lpStruct->uFlags);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage, (jint)lpStruct->uCallbackMessage);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.hIcon, (jint)lpStruct->hIcon);
+	(*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon, (jintLong)lpStruct->hIcon);
 #ifndef _WIN32_WCE
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwState, (jint)lpStruct->dwState);
 #endif
@@ -4618,11 +4618,11 @@ NOTIFYICONDATAW *getNOTIFYICONDATAWFields(JNIEnv *env, jobject lpObject, NOTIFYI
 {
 	if (!NOTIFYICONDATAWFc.cached) cacheNOTIFYICONDATAWFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize);
-	lpStruct->hWnd = (HWND)(*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.hWnd);
+	lpStruct->hWnd = (HWND)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd);
 	lpStruct->uID = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uID);
 	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags);
 	lpStruct->uCallbackMessage = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage);
-	lpStruct->hIcon = (HICON)(*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.hIcon);
+	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon);
 #ifndef _WIN32_WCE
 	lpStruct->dwState = (*env)->GetIntField(env, lpObject, NOTIFYICONDATAFc.dwState);
 #endif
@@ -4637,18 +4637,18 @@ NOTIFYICONDATAW *getNOTIFYICONDATAWFields(JNIEnv *env, jobject lpObject, NOTIFYI
 #endif
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAWFc.szTip);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTip) / 2, (jchar *)lpStruct->szTip);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTip) / sizeof(jchar), (jchar *)lpStruct->szTip);
 	}
 #ifndef _WIN32_WCE
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAWFc.szInfo);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfo) / 2, (jchar *)lpStruct->szInfo);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfo) / sizeof(jchar), (jchar *)lpStruct->szInfo);
 	}
 #endif
 #ifndef _WIN32_WCE
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAWFc.szInfoTitle);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfoTitle) / 2, (jchar *)lpStruct->szInfoTitle);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfoTitle) / sizeof(jchar), (jchar *)lpStruct->szInfoTitle);
 	}
 #endif
 	return lpStruct;
@@ -4658,11 +4658,11 @@ void setNOTIFYICONDATAWFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATAW *lp
 {
 	if (!NOTIFYICONDATAWFc.cached) cacheNOTIFYICONDATAWFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.cbSize, (jint)lpStruct->cbSize);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.hWnd, (jint)lpStruct->hWnd);
+	(*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hWnd, (jintLong)lpStruct->hWnd);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uID, (jint)lpStruct->uID);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uFlags, (jint)lpStruct->uFlags);
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.uCallbackMessage, (jint)lpStruct->uCallbackMessage);
-	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.hIcon, (jint)lpStruct->hIcon);
+	(*env)->SetIntLongField(env, lpObject, NOTIFYICONDATAFc.hIcon, (jintLong)lpStruct->hIcon);
 #ifndef _WIN32_WCE
 	(*env)->SetIntField(env, lpObject, NOTIFYICONDATAFc.dwState, (jint)lpStruct->dwState);
 #endif
@@ -4677,18 +4677,18 @@ void setNOTIFYICONDATAWFields(JNIEnv *env, jobject lpObject, NOTIFYICONDATAW *lp
 #endif
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAWFc.szTip);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTip) / 2, (jchar *)lpStruct->szTip);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTip) / sizeof(jchar), (jchar *)lpStruct->szTip);
 	}
 #ifndef _WIN32_WCE
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAWFc.szInfo);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfo) / 2, (jchar *)lpStruct->szInfo);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfo) / sizeof(jchar), (jchar *)lpStruct->szInfo);
 	}
 #endif
 #ifndef _WIN32_WCE
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, NOTIFYICONDATAWFc.szInfoTitle);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfoTitle) / 2, (jchar *)lpStruct->szInfoTitle);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szInfoTitle) / sizeof(jchar), (jchar *)lpStruct->szInfoTitle);
 	}
 #endif
 }
@@ -4708,8 +4708,8 @@ void cacheOFNOTIFYFields(JNIEnv *env, jobject lpObject)
 	if (OFNOTIFYFc.cached) return;
 	cacheNMHDRFields(env, lpObject);
 	OFNOTIFYFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	OFNOTIFYFc.lpOFN = (*env)->GetFieldID(env, OFNOTIFYFc.clazz, "lpOFN", "I");
-	OFNOTIFYFc.pszFile = (*env)->GetFieldID(env, OFNOTIFYFc.clazz, "pszFile", "I");
+	OFNOTIFYFc.lpOFN = (*env)->GetFieldID(env, OFNOTIFYFc.clazz, "lpOFN", I_J);
+	OFNOTIFYFc.pszFile = (*env)->GetFieldID(env, OFNOTIFYFc.clazz, "pszFile", I_J);
 	OFNOTIFYFc.cached = 1;
 }
 
@@ -4717,8 +4717,8 @@ OFNOTIFY *getOFNOTIFYFields(JNIEnv *env, jobject lpObject, OFNOTIFY *lpStruct)
 {
 	if (!OFNOTIFYFc.cached) cacheOFNOTIFYFields(env, lpObject);
 	getNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
-	lpStruct->lpOFN = (LPOPENFILENAME)(*env)->GetIntField(env, lpObject, OFNOTIFYFc.lpOFN);
-	lpStruct->pszFile = (LPTSTR)(*env)->GetIntField(env, lpObject, OFNOTIFYFc.pszFile);
+	lpStruct->lpOFN = (LPOPENFILENAME)(*env)->GetIntLongField(env, lpObject, OFNOTIFYFc.lpOFN);
+	lpStruct->pszFile = (LPTSTR)(*env)->GetIntLongField(env, lpObject, OFNOTIFYFc.pszFile);
 	return lpStruct;
 }
 
@@ -4726,8 +4726,8 @@ void setOFNOTIFYFields(JNIEnv *env, jobject lpObject, OFNOTIFY *lpStruct)
 {
 	if (!OFNOTIFYFc.cached) cacheOFNOTIFYFields(env, lpObject);
 	setNMHDRFields(env, lpObject, (NMHDR *)lpStruct);
-	(*env)->SetIntField(env, lpObject, OFNOTIFYFc.lpOFN, (jint)lpStruct->lpOFN);
-	(*env)->SetIntField(env, lpObject, OFNOTIFYFc.pszFile, (jint)lpStruct->pszFile);
+	(*env)->SetIntLongField(env, lpObject, OFNOTIFYFc.lpOFN, (jintLong)lpStruct->lpOFN);
+	(*env)->SetIntLongField(env, lpObject, OFNOTIFYFc.pszFile, (jintLong)lpStruct->pszFile);
 }
 #endif
 
@@ -4745,26 +4745,26 @@ void cacheOPENFILENAMEFields(JNIEnv *env, jobject lpObject)
 	if (OPENFILENAMEFc.cached) return;
 	OPENFILENAMEFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	OPENFILENAMEFc.lStructSize = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lStructSize", "I");
-	OPENFILENAMEFc.hwndOwner = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "hwndOwner", "I");
-	OPENFILENAMEFc.hInstance = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "hInstance", "I");
-	OPENFILENAMEFc.lpstrFilter = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrFilter", "I");
-	OPENFILENAMEFc.lpstrCustomFilter = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrCustomFilter", "I");
+	OPENFILENAMEFc.hwndOwner = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "hwndOwner", I_J);
+	OPENFILENAMEFc.hInstance = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "hInstance", I_J);
+	OPENFILENAMEFc.lpstrFilter = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrFilter", I_J);
+	OPENFILENAMEFc.lpstrCustomFilter = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrCustomFilter", I_J);
 	OPENFILENAMEFc.nMaxCustFilter = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "nMaxCustFilter", "I");
 	OPENFILENAMEFc.nFilterIndex = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "nFilterIndex", "I");
-	OPENFILENAMEFc.lpstrFile = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrFile", "I");
+	OPENFILENAMEFc.lpstrFile = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrFile", I_J);
 	OPENFILENAMEFc.nMaxFile = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "nMaxFile", "I");
-	OPENFILENAMEFc.lpstrFileTitle = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrFileTitle", "I");
+	OPENFILENAMEFc.lpstrFileTitle = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrFileTitle", I_J);
 	OPENFILENAMEFc.nMaxFileTitle = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "nMaxFileTitle", "I");
-	OPENFILENAMEFc.lpstrInitialDir = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrInitialDir", "I");
-	OPENFILENAMEFc.lpstrTitle = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrTitle", "I");
+	OPENFILENAMEFc.lpstrInitialDir = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrInitialDir", I_J);
+	OPENFILENAMEFc.lpstrTitle = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrTitle", I_J);
 	OPENFILENAMEFc.Flags = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "Flags", "I");
 	OPENFILENAMEFc.nFileOffset = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "nFileOffset", "S");
 	OPENFILENAMEFc.nFileExtension = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "nFileExtension", "S");
-	OPENFILENAMEFc.lpstrDefExt = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrDefExt", "I");
-	OPENFILENAMEFc.lCustData = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lCustData", "I");
-	OPENFILENAMEFc.lpfnHook = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpfnHook", "I");
-	OPENFILENAMEFc.lpTemplateName = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpTemplateName", "I");
-	OPENFILENAMEFc.pvReserved = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "pvReserved", "I");
+	OPENFILENAMEFc.lpstrDefExt = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpstrDefExt", I_J);
+	OPENFILENAMEFc.lCustData = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lCustData", I_J);
+	OPENFILENAMEFc.lpfnHook = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpfnHook", I_J);
+	OPENFILENAMEFc.lpTemplateName = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "lpTemplateName", I_J);
+	OPENFILENAMEFc.pvReserved = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "pvReserved", I_J);
 	OPENFILENAMEFc.dwReserved = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "dwReserved", "I");
 	OPENFILENAMEFc.FlagsEx = (*env)->GetFieldID(env, OPENFILENAMEFc.clazz, "FlagsEx", "I");
 	OPENFILENAMEFc.cached = 1;
@@ -4774,27 +4774,27 @@ OPENFILENAME *getOPENFILENAMEFields(JNIEnv *env, jobject lpObject, OPENFILENAME
 {
 	if (!OPENFILENAMEFc.cached) cacheOPENFILENAMEFields(env, lpObject);
 	lpStruct->lStructSize = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lStructSize);
-	lpStruct->hwndOwner = (HWND)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.hwndOwner);
-	lpStruct->hInstance = (HINSTANCE)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.hInstance);
-	lpStruct->lpstrFilter = (LPCTSTR)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lpstrFilter);
-	lpStruct->lpstrCustomFilter = (LPTSTR)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lpstrCustomFilter);
+	lpStruct->hwndOwner = (HWND)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.hwndOwner);
+	lpStruct->hInstance = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.hInstance);
+	lpStruct->lpstrFilter = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrFilter);
+	lpStruct->lpstrCustomFilter = (LPTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrCustomFilter);
 	lpStruct->nMaxCustFilter = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.nMaxCustFilter);
 	lpStruct->nFilterIndex = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.nFilterIndex);
-	lpStruct->lpstrFile = (LPTSTR)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lpstrFile);
+	lpStruct->lpstrFile = (LPTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrFile);
 	lpStruct->nMaxFile = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.nMaxFile);
-	lpStruct->lpstrFileTitle = (LPTSTR)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lpstrFileTitle);
+	lpStruct->lpstrFileTitle = (LPTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrFileTitle);
 	lpStruct->nMaxFileTitle = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.nMaxFileTitle);
-	lpStruct->lpstrInitialDir = (LPCTSTR)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lpstrInitialDir);
-	lpStruct->lpstrTitle = (LPCTSTR)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lpstrTitle);
+	lpStruct->lpstrInitialDir = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrInitialDir);
+	lpStruct->lpstrTitle = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrTitle);
 	lpStruct->Flags = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.Flags);
 	lpStruct->nFileOffset = (*env)->GetShortField(env, lpObject, OPENFILENAMEFc.nFileOffset);
 	lpStruct->nFileExtension = (*env)->GetShortField(env, lpObject, OPENFILENAMEFc.nFileExtension);
-	lpStruct->lpstrDefExt = (LPCTSTR)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lpstrDefExt);
-	lpStruct->lCustData = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lCustData);
-	lpStruct->lpfnHook = (LPOFNHOOKPROC)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lpfnHook);
-	lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.lpTemplateName);
+	lpStruct->lpstrDefExt = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrDefExt);
+	lpStruct->lCustData = (*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lCustData);
+	lpStruct->lpfnHook = (LPOFNHOOKPROC)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpfnHook);
+	lpStruct->lpTemplateName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.lpTemplateName);
 #ifndef _WIN32_WCE
-	lpStruct->pvReserved = (void *)(*env)->GetIntField(env, lpObject, OPENFILENAMEFc.pvReserved);
+	lpStruct->pvReserved = (void *)(*env)->GetIntLongField(env, lpObject, OPENFILENAMEFc.pvReserved);
 #endif
 #ifndef _WIN32_WCE
 	lpStruct->dwReserved = (*env)->GetIntField(env, lpObject, OPENFILENAMEFc.dwReserved);
@@ -4809,27 +4809,27 @@ void setOPENFILENAMEFields(JNIEnv *env, jobject lpObject, OPENFILENAME *lpStruct
 {
 	if (!OPENFILENAMEFc.cached) cacheOPENFILENAMEFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lStructSize, (jint)lpStruct->lStructSize);
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.hwndOwner, (jint)lpStruct->hwndOwner);
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.hInstance, (jint)lpStruct->hInstance);
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lpstrFilter, (jint)lpStruct->lpstrFilter);
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lpstrCustomFilter, (jint)lpStruct->lpstrCustomFilter);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.hwndOwner, (jintLong)lpStruct->hwndOwner);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.hInstance, (jintLong)lpStruct->hInstance);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrFilter, (jintLong)lpStruct->lpstrFilter);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrCustomFilter, (jintLong)lpStruct->lpstrCustomFilter);
 	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.nMaxCustFilter, (jint)lpStruct->nMaxCustFilter);
 	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.nFilterIndex, (jint)lpStruct->nFilterIndex);
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lpstrFile, (jint)lpStruct->lpstrFile);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrFile, (jintLong)lpStruct->lpstrFile);
 	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.nMaxFile, (jint)lpStruct->nMaxFile);
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lpstrFileTitle, (jint)lpStruct->lpstrFileTitle);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrFileTitle, (jintLong)lpStruct->lpstrFileTitle);
 	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.nMaxFileTitle, (jint)lpStruct->nMaxFileTitle);
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lpstrInitialDir, (jint)lpStruct->lpstrInitialDir);
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lpstrTitle, (jint)lpStruct->lpstrTitle);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrInitialDir, (jintLong)lpStruct->lpstrInitialDir);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrTitle, (jintLong)lpStruct->lpstrTitle);
 	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.Flags, (jint)lpStruct->Flags);
 	(*env)->SetShortField(env, lpObject, OPENFILENAMEFc.nFileOffset, (jshort)lpStruct->nFileOffset);
 	(*env)->SetShortField(env, lpObject, OPENFILENAMEFc.nFileExtension, (jshort)lpStruct->nFileExtension);
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lpstrDefExt, (jint)lpStruct->lpstrDefExt);
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lCustData, (jint)lpStruct->lCustData);
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lpfnHook, (jint)lpStruct->lpfnHook);
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.lpTemplateName, (jint)lpStruct->lpTemplateName);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpstrDefExt, (jintLong)lpStruct->lpstrDefExt);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lCustData, (jintLong)lpStruct->lCustData);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpfnHook, (jintLong)lpStruct->lpfnHook);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.lpTemplateName, (jintLong)lpStruct->lpTemplateName);
 #ifndef _WIN32_WCE
-	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.pvReserved, (jint)lpStruct->pvReserved);
+	(*env)->SetIntLongField(env, lpObject, OPENFILENAMEFc.pvReserved, (jintLong)lpStruct->pvReserved);
 #endif
 #ifndef _WIN32_WCE
 	(*env)->SetIntField(env, lpObject, OPENFILENAMEFc.dwReserved, (jint)lpStruct->dwReserved);
@@ -5056,7 +5056,7 @@ OSVERSIONINFOEXW *getOSVERSIONINFOEXWFields(JNIEnv *env, jobject lpObject, OSVER
 	lpStruct->wReserved = (*env)->GetByteField(env, lpObject, OSVERSIONINFOEXFc.wReserved);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, OSVERSIONINFOEXWFc.szCSDVersion);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szCSDVersion) / 2, (jchar *)lpStruct->szCSDVersion);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szCSDVersion) / sizeof(jchar), (jchar *)lpStruct->szCSDVersion);
 	}
 	return lpStruct;
 }
@@ -5072,7 +5072,7 @@ void setOSVERSIONINFOEXWFields(JNIEnv *env, jobject lpObject, OSVERSIONINFOEXW *
 	(*env)->SetByteField(env, lpObject, OSVERSIONINFOEXFc.wReserved, (jbyte)lpStruct->wReserved);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, OSVERSIONINFOEXWFc.szCSDVersion);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szCSDVersion) / 2, (jchar *)lpStruct->szCSDVersion);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szCSDVersion) / sizeof(jchar), (jchar *)lpStruct->szCSDVersion);
 	}
 }
 #endif
@@ -5105,7 +5105,7 @@ OSVERSIONINFOW *getOSVERSIONINFOWFields(JNIEnv *env, jobject lpObject, OSVERSION
 	lpStruct->dwPlatformId = (*env)->GetIntField(env, lpObject, OSVERSIONINFOFc.dwPlatformId);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, OSVERSIONINFOWFc.szCSDVersion);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szCSDVersion) / 2, (jchar *)lpStruct->szCSDVersion);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szCSDVersion) / sizeof(jchar), (jchar *)lpStruct->szCSDVersion);
 	}
 	return lpStruct;
 }
@@ -5120,7 +5120,7 @@ void setOSVERSIONINFOWFields(JNIEnv *env, jobject lpObject, OSVERSIONINFOW *lpSt
 	(*env)->SetIntField(env, lpObject, OSVERSIONINFOFc.dwPlatformId, (jint)lpStruct->dwPlatformId);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, OSVERSIONINFOWFc.szCSDVersion);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szCSDVersion) / 2, (jchar *)lpStruct->szCSDVersion);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szCSDVersion) / sizeof(jchar), (jchar *)lpStruct->szCSDVersion);
 	}
 }
 #endif
@@ -5174,10 +5174,10 @@ void cacheOUTLINETEXTMETRICFields(JNIEnv *env, jobject lpObject)
 	OUTLINETEXTMETRICFc.otmsStrikeoutPosition = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmsStrikeoutPosition", "I");
 	OUTLINETEXTMETRICFc.otmsUnderscoreSize = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmsUnderscoreSize", "I");
 	OUTLINETEXTMETRICFc.otmsUnderscorePosition = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmsUnderscorePosition", "I");
-	OUTLINETEXTMETRICFc.otmpFamilyName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpFamilyName", "I");
-	OUTLINETEXTMETRICFc.otmpFaceName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpFaceName", "I");
-	OUTLINETEXTMETRICFc.otmpStyleName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpStyleName", "I");
-	OUTLINETEXTMETRICFc.otmpFullName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpFullName", "I");
+	OUTLINETEXTMETRICFc.otmpFamilyName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpFamilyName", I_J);
+	OUTLINETEXTMETRICFc.otmpFaceName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpFaceName", I_J);
+	OUTLINETEXTMETRICFc.otmpStyleName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpStyleName", I_J);
+	OUTLINETEXTMETRICFc.otmpFullName = (*env)->GetFieldID(env, OUTLINETEXTMETRICFc.clazz, "otmpFullName", I_J);
 	OUTLINETEXTMETRICFc.cached = 1;
 }
 
@@ -5235,10 +5235,10 @@ OUTLINETEXTMETRIC *getOUTLINETEXTMETRICFields(JNIEnv *env, jobject lpObject, OUT
 	lpStruct->otmsStrikeoutPosition = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutPosition);
 	lpStruct->otmsUnderscoreSize = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscoreSize);
 	lpStruct->otmsUnderscorePosition = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscorePosition);
-	lpStruct->otmpFamilyName = (PSTR)(*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName);
-	lpStruct->otmpFaceName = (PSTR)(*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName);
-	lpStruct->otmpStyleName = (PSTR)(*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName);
-	lpStruct->otmpFullName = (PSTR)(*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName);
+	lpStruct->otmpFamilyName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName);
+	lpStruct->otmpFaceName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName);
+	lpStruct->otmpStyleName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName);
+	lpStruct->otmpFullName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName);
 	return lpStruct;
 }
 
@@ -5296,10 +5296,10 @@ void setOUTLINETEXTMETRICFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRIC
 	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutPosition, (jint)lpStruct->otmsStrikeoutPosition);
 	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscoreSize, (jint)lpStruct->otmsUnderscoreSize);
 	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscorePosition, (jint)lpStruct->otmsUnderscorePosition);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName, (jint)lpStruct->otmpFamilyName);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName, (jint)lpStruct->otmpFaceName);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName, (jint)lpStruct->otmpStyleName);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName, (jint)lpStruct->otmpFullName);
+	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName, (jintLong)lpStruct->otmpFamilyName);
+	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName, (jintLong)lpStruct->otmpFaceName);
+	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName, (jintLong)lpStruct->otmpStyleName);
+	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName, (jintLong)lpStruct->otmpFullName);
 }
 #endif
 
@@ -5375,10 +5375,10 @@ OUTLINETEXTMETRICA *getOUTLINETEXTMETRICAFields(JNIEnv *env, jobject lpObject, O
 	lpStruct->otmsStrikeoutPosition = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutPosition);
 	lpStruct->otmsUnderscoreSize = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscoreSize);
 	lpStruct->otmsUnderscorePosition = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscorePosition);
-	lpStruct->otmpFamilyName = (PSTR)(*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName);
-	lpStruct->otmpFaceName = (PSTR)(*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName);
-	lpStruct->otmpStyleName = (PSTR)(*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName);
-	lpStruct->otmpFullName = (PSTR)(*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName);
+	lpStruct->otmpFamilyName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName);
+	lpStruct->otmpFaceName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName);
+	lpStruct->otmpStyleName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName);
+	lpStruct->otmpFullName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName);
 	{
 	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICAFc.otmTextMetrics);
 	if (lpObject1 != NULL) getTEXTMETRICAFields(env, lpObject1, &lpStruct->otmTextMetrics);
@@ -5440,10 +5440,10 @@ void setOUTLINETEXTMETRICAFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRI
 	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutPosition, (jint)lpStruct->otmsStrikeoutPosition);
 	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscoreSize, (jint)lpStruct->otmsUnderscoreSize);
 	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscorePosition, (jint)lpStruct->otmsUnderscorePosition);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName, (jint)lpStruct->otmpFamilyName);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName, (jint)lpStruct->otmpFaceName);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName, (jint)lpStruct->otmpStyleName);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName, (jint)lpStruct->otmpFullName);
+	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName, (jintLong)lpStruct->otmpFamilyName);
+	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName, (jintLong)lpStruct->otmpFaceName);
+	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName, (jintLong)lpStruct->otmpStyleName);
+	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName, (jintLong)lpStruct->otmpFullName);
 	{
 	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICAFc.otmTextMetrics);
 	if (lpObject1 != NULL) setTEXTMETRICAFields(env, lpObject1, &lpStruct->otmTextMetrics);
@@ -5523,10 +5523,10 @@ OUTLINETEXTMETRICW *getOUTLINETEXTMETRICWFields(JNIEnv *env, jobject lpObject, O
 	lpStruct->otmsStrikeoutPosition = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutPosition);
 	lpStruct->otmsUnderscoreSize = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscoreSize);
 	lpStruct->otmsUnderscorePosition = (*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscorePosition);
-	lpStruct->otmpFamilyName = (PSTR)(*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName);
-	lpStruct->otmpFaceName = (PSTR)(*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName);
-	lpStruct->otmpStyleName = (PSTR)(*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName);
-	lpStruct->otmpFullName = (PSTR)(*env)->GetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName);
+	lpStruct->otmpFamilyName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName);
+	lpStruct->otmpFaceName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName);
+	lpStruct->otmpStyleName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName);
+	lpStruct->otmpFullName = (PSTR)(*env)->GetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName);
 	{
 	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICWFc.otmTextMetrics);
 	if (lpObject1 != NULL) getTEXTMETRICWFields(env, lpObject1, &lpStruct->otmTextMetrics);
@@ -5588,10 +5588,10 @@ void setOUTLINETEXTMETRICWFields(JNIEnv *env, jobject lpObject, OUTLINETEXTMETRI
 	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsStrikeoutPosition, (jint)lpStruct->otmsStrikeoutPosition);
 	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscoreSize, (jint)lpStruct->otmsUnderscoreSize);
 	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmsUnderscorePosition, (jint)lpStruct->otmsUnderscorePosition);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName, (jint)lpStruct->otmpFamilyName);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName, (jint)lpStruct->otmpFaceName);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName, (jint)lpStruct->otmpStyleName);
-	(*env)->SetIntField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName, (jint)lpStruct->otmpFullName);
+	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFamilyName, (jintLong)lpStruct->otmpFamilyName);
+	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFaceName, (jintLong)lpStruct->otmpFaceName);
+	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpStyleName, (jintLong)lpStruct->otmpStyleName);
+	(*env)->SetIntLongField(env, lpObject, OUTLINETEXTMETRICFc.otmpFullName, (jintLong)lpStruct->otmpFullName);
 	{
 	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, OUTLINETEXTMETRICWFc.otmTextMetrics);
 	if (lpObject1 != NULL) setTEXTMETRICWFields(env, lpObject1, &lpStruct->otmTextMetrics);
@@ -5612,7 +5612,7 @@ void cachePAINTSTRUCTFields(JNIEnv *env, jobject lpObject)
 {
 	if (PAINTSTRUCTFc.cached) return;
 	PAINTSTRUCTFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	PAINTSTRUCTFc.hdc = (*env)->GetFieldID(env, PAINTSTRUCTFc.clazz, "hdc", "I");
+	PAINTSTRUCTFc.hdc = (*env)->GetFieldID(env, PAINTSTRUCTFc.clazz, "hdc", I_J);
 	PAINTSTRUCTFc.fErase = (*env)->GetFieldID(env, PAINTSTRUCTFc.clazz, "fErase", "Z");
 	PAINTSTRUCTFc.left = (*env)->GetFieldID(env, PAINTSTRUCTFc.clazz, "left", "I");
 	PAINTSTRUCTFc.top = (*env)->GetFieldID(env, PAINTSTRUCTFc.clazz, "top", "I");
@@ -5627,7 +5627,7 @@ void cachePAINTSTRUCTFields(JNIEnv *env, jobject lpObject)
 PAINTSTRUCT *getPAINTSTRUCTFields(JNIEnv *env, jobject lpObject, PAINTSTRUCT *lpStruct)
 {
 	if (!PAINTSTRUCTFc.cached) cachePAINTSTRUCTFields(env, lpObject);
-	lpStruct->hdc = (HDC)(*env)->GetIntField(env, lpObject, PAINTSTRUCTFc.hdc);
+	lpStruct->hdc = (HDC)(*env)->GetIntLongField(env, lpObject, PAINTSTRUCTFc.hdc);
 	lpStruct->fErase = (*env)->GetBooleanField(env, lpObject, PAINTSTRUCTFc.fErase);
 	lpStruct->rcPaint.left = (*env)->GetIntField(env, lpObject, PAINTSTRUCTFc.left);
 	lpStruct->rcPaint.top = (*env)->GetIntField(env, lpObject, PAINTSTRUCTFc.top);
@@ -5645,7 +5645,7 @@ PAINTSTRUCT *getPAINTSTRUCTFields(JNIEnv *env, jobject lpObject, PAINTSTRUCT *lp
 void setPAINTSTRUCTFields(JNIEnv *env, jobject lpObject, PAINTSTRUCT *lpStruct)
 {
 	if (!PAINTSTRUCTFc.cached) cachePAINTSTRUCTFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, PAINTSTRUCTFc.hdc, (jint)lpStruct->hdc);
+	(*env)->SetIntLongField(env, lpObject, PAINTSTRUCTFc.hdc, (jintLong)lpStruct->hdc);
 	(*env)->SetBooleanField(env, lpObject, PAINTSTRUCTFc.fErase, (jboolean)lpStruct->fErase);
 	(*env)->SetIntField(env, lpObject, PAINTSTRUCTFc.left, (jint)lpStruct->rcPaint.left);
 	(*env)->SetIntField(env, lpObject, PAINTSTRUCTFc.top, (jint)lpStruct->rcPaint.top);
@@ -5766,24 +5766,24 @@ void cachePRINTDLGFields(JNIEnv *env, jobject lpObject)
 	if (PRINTDLGFc.cached) return;
 	PRINTDLGFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	PRINTDLGFc.lStructSize = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lStructSize", "I");
-	PRINTDLGFc.hwndOwner = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hwndOwner", "I");
-	PRINTDLGFc.hDevMode = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hDevMode", "I");
-	PRINTDLGFc.hDevNames = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hDevNames", "I");
-	PRINTDLGFc.hDC = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hDC", "I");
+	PRINTDLGFc.hwndOwner = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hwndOwner", I_J);
+	PRINTDLGFc.hDevMode = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hDevMode", I_J);
+	PRINTDLGFc.hDevNames = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hDevNames", I_J);
+	PRINTDLGFc.hDC = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hDC", I_J);
 	PRINTDLGFc.Flags = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "Flags", "I");
 	PRINTDLGFc.nFromPage = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "nFromPage", "S");
 	PRINTDLGFc.nToPage = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "nToPage", "S");
 	PRINTDLGFc.nMinPage = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "nMinPage", "S");
 	PRINTDLGFc.nMaxPage = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "nMaxPage", "S");
 	PRINTDLGFc.nCopies = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "nCopies", "S");
-	PRINTDLGFc.hInstance = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hInstance", "I");
-	PRINTDLGFc.lCustData = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lCustData", "I");
-	PRINTDLGFc.lpfnPrintHook = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpfnPrintHook", "I");
-	PRINTDLGFc.lpfnSetupHook = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpfnSetupHook", "I");
-	PRINTDLGFc.lpPrintTemplateName = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpPrintTemplateName", "I");
-	PRINTDLGFc.lpSetupTemplateName = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpSetupTemplateName", "I");
-	PRINTDLGFc.hPrintTemplate = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hPrintTemplate", "I");
-	PRINTDLGFc.hSetupTemplate = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hSetupTemplate", "I");
+	PRINTDLGFc.hInstance = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hInstance", I_J);
+	PRINTDLGFc.lCustData = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lCustData", I_J);
+	PRINTDLGFc.lpfnPrintHook = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpfnPrintHook", I_J);
+	PRINTDLGFc.lpfnSetupHook = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpfnSetupHook", I_J);
+	PRINTDLGFc.lpPrintTemplateName = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpPrintTemplateName", I_J);
+	PRINTDLGFc.lpSetupTemplateName = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "lpSetupTemplateName", I_J);
+	PRINTDLGFc.hPrintTemplate = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hPrintTemplate", I_J);
+	PRINTDLGFc.hSetupTemplate = (*env)->GetFieldID(env, PRINTDLGFc.clazz, "hSetupTemplate", I_J);
 	PRINTDLGFc.cached = 1;
 }
 
@@ -5791,24 +5791,24 @@ PRINTDLG *getPRINTDLGFields(JNIEnv *env, jobject lpObject, PRINTDLG *lpStruct)
 {
 	if (!PRINTDLGFc.cached) cachePRINTDLGFields(env, lpObject);
 	lpStruct->lStructSize = (*env)->GetIntField(env, lpObject, PRINTDLGFc.lStructSize);
-	lpStruct->hwndOwner = (HWND)(*env)->GetIntField(env, lpObject, PRINTDLGFc.hwndOwner);
-	lpStruct->hDevMode = (HGLOBAL)(*env)->GetIntField(env, lpObject, PRINTDLGFc.hDevMode);
-	lpStruct->hDevNames = (HGLOBAL)(*env)->GetIntField(env, lpObject, PRINTDLGFc.hDevNames);
-	lpStruct->hDC = (HDC)(*env)->GetIntField(env, lpObject, PRINTDLGFc.hDC);
+	lpStruct->hwndOwner = (HWND)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hwndOwner);
+	lpStruct->hDevMode = (HGLOBAL)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hDevMode);
+	lpStruct->hDevNames = (HGLOBAL)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hDevNames);
+	lpStruct->hDC = (HDC)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hDC);
 	lpStruct->Flags = (*env)->GetIntField(env, lpObject, PRINTDLGFc.Flags);
 	lpStruct->nFromPage = (*env)->GetShortField(env, lpObject, PRINTDLGFc.nFromPage);
 	lpStruct->nToPage = (*env)->GetShortField(env, lpObject, PRINTDLGFc.nToPage);
 	lpStruct->nMinPage = (*env)->GetShortField(env, lpObject, PRINTDLGFc.nMinPage);
 	lpStruct->nMaxPage = (*env)->GetShortField(env, lpObject, PRINTDLGFc.nMaxPage);
 	lpStruct->nCopies = (*env)->GetShortField(env, lpObject, PRINTDLGFc.nCopies);
-	lpStruct->hInstance = (HINSTANCE)(*env)->GetIntField(env, lpObject, PRINTDLGFc.hInstance);
-	lpStruct->lCustData = (*env)->GetIntField(env, lpObject, PRINTDLGFc.lCustData);
-	lpStruct->lpfnPrintHook = (LPPRINTHOOKPROC)(*env)->GetIntField(env, lpObject, PRINTDLGFc.lpfnPrintHook);
-	lpStruct->lpfnSetupHook = (LPPRINTHOOKPROC)(*env)->GetIntField(env, lpObject, PRINTDLGFc.lpfnSetupHook);
-	lpStruct->lpPrintTemplateName = (LPCTSTR)(*env)->GetIntField(env, lpObject, PRINTDLGFc.lpPrintTemplateName);
-	lpStruct->lpSetupTemplateName = (LPCTSTR)(*env)->GetIntField(env, lpObject, PRINTDLGFc.lpSetupTemplateName);
-	lpStruct->hPrintTemplate = (HGLOBAL)(*env)->GetIntField(env, lpObject, PRINTDLGFc.hPrintTemplate);
-	lpStruct->hSetupTemplate = (HGLOBAL)(*env)->GetIntField(env, lpObject, PRINTDLGFc.hSetupTemplate);
+	lpStruct->hInstance = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hInstance);
+	lpStruct->lCustData = (*env)->GetIntLongField(env, lpObject, PRINTDLGFc.lCustData);
+	lpStruct->lpfnPrintHook = (LPPRINTHOOKPROC)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.lpfnPrintHook);
+	lpStruct->lpfnSetupHook = (LPPRINTHOOKPROC)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.lpfnSetupHook);
+	lpStruct->lpPrintTemplateName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.lpPrintTemplateName);
+	lpStruct->lpSetupTemplateName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.lpSetupTemplateName);
+	lpStruct->hPrintTemplate = (HGLOBAL)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hPrintTemplate);
+	lpStruct->hSetupTemplate = (HGLOBAL)(*env)->GetIntLongField(env, lpObject, PRINTDLGFc.hSetupTemplate);
 	return lpStruct;
 }
 
@@ -5816,24 +5816,24 @@ void setPRINTDLGFields(JNIEnv *env, jobject lpObject, PRINTDLG *lpStruct)
 {
 	if (!PRINTDLGFc.cached) cachePRINTDLGFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, PRINTDLGFc.lStructSize, (jint)lpStruct->lStructSize);
-	(*env)->SetIntField(env, lpObject, PRINTDLGFc.hwndOwner, (jint)lpStruct->hwndOwner);
-	(*env)->SetIntField(env, lpObject, PRINTDLGFc.hDevMode, (jint)lpStruct->hDevMode);
-	(*env)->SetIntField(env, lpObject, PRINTDLGFc.hDevNames, (jint)lpStruct->hDevNames);
-	(*env)->SetIntField(env, lpObject, PRINTDLGFc.hDC, (jint)lpStruct->hDC);
+	(*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hwndOwner, (jintLong)lpStruct->hwndOwner);
+	(*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hDevMode, (jintLong)lpStruct->hDevMode);
+	(*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hDevNames, (jintLong)lpStruct->hDevNames);
+	(*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hDC, (jintLong)lpStruct->hDC);
 	(*env)->SetIntField(env, lpObject, PRINTDLGFc.Flags, (jint)lpStruct->Flags);
 	(*env)->SetShortField(env, lpObject, PRINTDLGFc.nFromPage, (jshort)lpStruct->nFromPage);
 	(*env)->SetShortField(env, lpObject, PRINTDLGFc.nToPage, (jshort)lpStruct->nToPage);
 	(*env)->SetShortField(env, lpObject, PRINTDLGFc.nMinPage, (jshort)lpStruct->nMinPage);
 	(*env)->SetShortField(env, lpObject, PRINTDLGFc.nMaxPage, (jshort)lpStruct->nMaxPage);
 	(*env)->SetShortField(env, lpObject, PRINTDLGFc.nCopies, (jshort)lpStruct->nCopies);
-	(*env)->SetIntField(env, lpObject, PRINTDLGFc.hInstance, (jint)lpStruct->hInstance);
-	(*env)->SetIntField(env, lpObject, PRINTDLGFc.lCustData, (jint)lpStruct->lCustData);
-	(*env)->SetIntField(env, lpObject, PRINTDLGFc.lpfnPrintHook, (jint)lpStruct->lpfnPrintHook);
-	(*env)->SetIntField(env, lpObject, PRINTDLGFc.lpfnSetupHook, (jint)lpStruct->lpfnSetupHook);
-	(*env)->SetIntField(env, lpObject, PRINTDLGFc.lpPrintTemplateName, (jint)lpStruct->lpPrintTemplateName);
-	(*env)->SetIntField(env, lpObject, PRINTDLGFc.lpSetupTemplateName, (jint)lpStruct->lpSetupTemplateName);
-	(*env)->SetIntField(env, lpObject, PRINTDLGFc.hPrintTemplate, (jint)lpStruct->hPrintTemplate);
-	(*env)->SetIntField(env, lpObject, PRINTDLGFc.hSetupTemplate, (jint)lpStruct->hSetupTemplate);
+	(*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hInstance, (jintLong)lpStruct->hInstance);
+	(*env)->SetIntLongField(env, lpObject, PRINTDLGFc.lCustData, (jintLong)lpStruct->lCustData);
+	(*env)->SetIntLongField(env, lpObject, PRINTDLGFc.lpfnPrintHook, (jintLong)lpStruct->lpfnPrintHook);
+	(*env)->SetIntLongField(env, lpObject, PRINTDLGFc.lpfnSetupHook, (jintLong)lpStruct->lpfnSetupHook);
+	(*env)->SetIntLongField(env, lpObject, PRINTDLGFc.lpPrintTemplateName, (jintLong)lpStruct->lpPrintTemplateName);
+	(*env)->SetIntLongField(env, lpObject, PRINTDLGFc.lpSetupTemplateName, (jintLong)lpStruct->lpSetupTemplateName);
+	(*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hPrintTemplate, (jintLong)lpStruct->hPrintTemplate);
+	(*env)->SetIntLongField(env, lpObject, PRINTDLGFc.hSetupTemplate, (jintLong)lpStruct->hSetupTemplate);
 }
 #endif
 
@@ -5850,8 +5850,8 @@ void cachePROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject)
 {
 	if (PROCESS_INFORMATIONFc.cached) return;
 	PROCESS_INFORMATIONFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	PROCESS_INFORMATIONFc.hProcess = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "hProcess", "I");
-	PROCESS_INFORMATIONFc.hThread = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "hThread", "I");
+	PROCESS_INFORMATIONFc.hProcess = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "hProcess", I_J);
+	PROCESS_INFORMATIONFc.hThread = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "hThread", I_J);
 	PROCESS_INFORMATIONFc.dwProcessId = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "dwProcessId", "I");
 	PROCESS_INFORMATIONFc.dwThreadId = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "dwThreadId", "I");
 	PROCESS_INFORMATIONFc.cached = 1;
@@ -5860,8 +5860,8 @@ void cachePROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject)
 PROCESS_INFORMATION *getPROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject, PROCESS_INFORMATION *lpStruct)
 {
 	if (!PROCESS_INFORMATIONFc.cached) cachePROCESS_INFORMATIONFields(env, lpObject);
-	lpStruct->hProcess = (HANDLE)(*env)->GetIntField(env, lpObject, PROCESS_INFORMATIONFc.hProcess);
-	lpStruct->hThread = (HANDLE)(*env)->GetIntField(env, lpObject, PROCESS_INFORMATIONFc.hThread);
+	lpStruct->hProcess = (HANDLE)(*env)->GetIntLongField(env, lpObject, PROCESS_INFORMATIONFc.hProcess);
+	lpStruct->hThread = (HANDLE)(*env)->GetIntLongField(env, lpObject, PROCESS_INFORMATIONFc.hThread);
 	lpStruct->dwProcessId = (*env)->GetIntField(env, lpObject, PROCESS_INFORMATIONFc.dwProcessId);
 	lpStruct->dwThreadId = (*env)->GetIntField(env, lpObject, PROCESS_INFORMATIONFc.dwThreadId);
 	return lpStruct;
@@ -5870,8 +5870,8 @@ PROCESS_INFORMATION *getPROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject,
 void setPROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject, PROCESS_INFORMATION *lpStruct)
 {
 	if (!PROCESS_INFORMATIONFc.cached) cachePROCESS_INFORMATIONFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, PROCESS_INFORMATIONFc.hProcess, (jint)lpStruct->hProcess);
-	(*env)->SetIntField(env, lpObject, PROCESS_INFORMATIONFc.hThread, (jint)lpStruct->hThread);
+	(*env)->SetIntLongField(env, lpObject, PROCESS_INFORMATIONFc.hProcess, (jintLong)lpStruct->hProcess);
+	(*env)->SetIntLongField(env, lpObject, PROCESS_INFORMATIONFc.hThread, (jintLong)lpStruct->hThread);
 	(*env)->SetIntField(env, lpObject, PROCESS_INFORMATIONFc.dwProcessId, (jint)lpStruct->dwProcessId);
 	(*env)->SetIntField(env, lpObject, PROCESS_INFORMATIONFc.dwThreadId, (jint)lpStruct->dwThreadId);
 }
@@ -5895,20 +5895,20 @@ void cacheREBARBANDINFOFields(JNIEnv *env, jobject lpObject)
 	REBARBANDINFOFc.fStyle = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "fStyle", "I");
 	REBARBANDINFOFc.clrFore = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "clrFore", "I");
 	REBARBANDINFOFc.clrBack = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "clrBack", "I");
-	REBARBANDINFOFc.lpText = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "lpText", "I");
+	REBARBANDINFOFc.lpText = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "lpText", I_J);
 	REBARBANDINFOFc.cch = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cch", "I");
 	REBARBANDINFOFc.iImage = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "iImage", "I");
-	REBARBANDINFOFc.hwndChild = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "hwndChild", "I");
+	REBARBANDINFOFc.hwndChild = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "hwndChild", I_J);
 	REBARBANDINFOFc.cxMinChild = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cxMinChild", "I");
 	REBARBANDINFOFc.cyMinChild = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cyMinChild", "I");
 	REBARBANDINFOFc.cx = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cx", "I");
-	REBARBANDINFOFc.hbmBack = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "hbmBack", "I");
+	REBARBANDINFOFc.hbmBack = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "hbmBack", I_J);
 	REBARBANDINFOFc.wID = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "wID", "I");
 	REBARBANDINFOFc.cyChild = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cyChild", "I");
 	REBARBANDINFOFc.cyMaxChild = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cyMaxChild", "I");
 	REBARBANDINFOFc.cyIntegral = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cyIntegral", "I");
 	REBARBANDINFOFc.cxIdeal = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cxIdeal", "I");
-	REBARBANDINFOFc.lParam = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "lParam", "I");
+	REBARBANDINFOFc.lParam = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "lParam", I_J);
 	REBARBANDINFOFc.cxHeader = (*env)->GetFieldID(env, REBARBANDINFOFc.clazz, "cxHeader", "I");
 	REBARBANDINFOFc.cached = 1;
 }
@@ -5921,20 +5921,20 @@ REBARBANDINFO *getREBARBANDINFOFields(JNIEnv *env, jobject lpObject, REBARBANDIN
 	lpStruct->fStyle = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.fStyle);
 	lpStruct->clrFore = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.clrFore);
 	lpStruct->clrBack = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.clrBack);
-	lpStruct->lpText = (LPTSTR)(*env)->GetIntField(env, lpObject, REBARBANDINFOFc.lpText);
+	lpStruct->lpText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, REBARBANDINFOFc.lpText);
 	lpStruct->cch = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cch);
 	lpStruct->iImage = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.iImage);
-	lpStruct->hwndChild = (HWND)(*env)->GetIntField(env, lpObject, REBARBANDINFOFc.hwndChild);
+	lpStruct->hwndChild = (HWND)(*env)->GetIntLongField(env, lpObject, REBARBANDINFOFc.hwndChild);
 	lpStruct->cxMinChild = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cxMinChild);
 	lpStruct->cyMinChild = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cyMinChild);
 	lpStruct->cx = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cx);
-	lpStruct->hbmBack = (HBITMAP)(*env)->GetIntField(env, lpObject, REBARBANDINFOFc.hbmBack);
+	lpStruct->hbmBack = (HBITMAP)(*env)->GetIntLongField(env, lpObject, REBARBANDINFOFc.hbmBack);
 	lpStruct->wID = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.wID);
 	lpStruct->cyChild = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cyChild);
 	lpStruct->cyMaxChild = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cyMaxChild);
 	lpStruct->cyIntegral = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cyIntegral);
 	lpStruct->cxIdeal = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cxIdeal);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.lParam);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, REBARBANDINFOFc.lParam);
 #ifndef _WIN32_WCE
 	lpStruct->cxHeader = (*env)->GetIntField(env, lpObject, REBARBANDINFOFc.cxHeader);
 #endif
@@ -5949,20 +5949,20 @@ void setREBARBANDINFOFields(JNIEnv *env, jobject lpObject, REBARBANDINFO *lpStru
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.fStyle, (jint)lpStruct->fStyle);
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.clrFore, (jint)lpStruct->clrFore);
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.clrBack, (jint)lpStruct->clrBack);
-	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.lpText, (jint)lpStruct->lpText);
+	(*env)->SetIntLongField(env, lpObject, REBARBANDINFOFc.lpText, (jintLong)lpStruct->lpText);
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cch, (jint)lpStruct->cch);
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.iImage, (jint)lpStruct->iImage);
-	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.hwndChild, (jint)lpStruct->hwndChild);
+	(*env)->SetIntLongField(env, lpObject, REBARBANDINFOFc.hwndChild, (jintLong)lpStruct->hwndChild);
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cxMinChild, (jint)lpStruct->cxMinChild);
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cyMinChild, (jint)lpStruct->cyMinChild);
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cx, (jint)lpStruct->cx);
-	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.hbmBack, (jint)lpStruct->hbmBack);
+	(*env)->SetIntLongField(env, lpObject, REBARBANDINFOFc.hbmBack, (jintLong)lpStruct->hbmBack);
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.wID, (jint)lpStruct->wID);
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cyChild, (jint)lpStruct->cyChild);
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cyMaxChild, (jint)lpStruct->cyMaxChild);
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cyIntegral, (jint)lpStruct->cyIntegral);
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cxIdeal, (jint)lpStruct->cxIdeal);
-	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, REBARBANDINFOFc.lParam, (jintLong)lpStruct->lParam);
 #ifndef _WIN32_WCE
 	(*env)->SetIntField(env, lpObject, REBARBANDINFOFc.cxHeader, (jint)lpStruct->cxHeader);
 #endif
@@ -6468,7 +6468,7 @@ SCROLLBARINFO *getSCROLLBARINFOFields(JNIEnv *env, jobject lpObject, SCROLLBARIN
 	lpStruct->reserved = (*env)->GetIntField(env, lpObject, SCROLLBARINFOFc.reserved);
 	{
 	jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, SCROLLBARINFOFc.rgstate);
-	(*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgstate) / 4, (jint *)lpStruct->rgstate);
+	(*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgstate) / sizeof(jint), (jint *)lpStruct->rgstate);
 	}
 	return lpStruct;
 }
@@ -6487,7 +6487,7 @@ void setSCROLLBARINFOFields(JNIEnv *env, jobject lpObject, SCROLLBARINFO *lpStru
 	(*env)->SetIntField(env, lpObject, SCROLLBARINFOFc.reserved, (jint)lpStruct->reserved);
 	{
 	jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, SCROLLBARINFOFc.rgstate);
-	(*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgstate) / 4, (jint *)lpStruct->rgstate);
+	(*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->rgstate) / sizeof(jint), (jint *)lpStruct->rgstate);
 	}
 }
 #endif
@@ -6555,7 +6555,7 @@ void cacheSHACTIVATEINFOFields(JNIEnv *env, jobject lpObject)
 	if (SHACTIVATEINFOFc.cached) return;
 	SHACTIVATEINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	SHACTIVATEINFOFc.cbSize = (*env)->GetFieldID(env, SHACTIVATEINFOFc.clazz, "cbSize", "I");
-	SHACTIVATEINFOFc.hwndLastFocus = (*env)->GetFieldID(env, SHACTIVATEINFOFc.clazz, "hwndLastFocus", "I");
+	SHACTIVATEINFOFc.hwndLastFocus = (*env)->GetFieldID(env, SHACTIVATEINFOFc.clazz, "hwndLastFocus", I_J);
 	SHACTIVATEINFOFc.fSipUp = (*env)->GetFieldID(env, SHACTIVATEINFOFc.clazz, "fSipUp", "I");
 	SHACTIVATEINFOFc.fSipOnDeactivation = (*env)->GetFieldID(env, SHACTIVATEINFOFc.clazz, "fSipOnDeactivation", "I");
 	SHACTIVATEINFOFc.fActive = (*env)->GetFieldID(env, SHACTIVATEINFOFc.clazz, "fActive", "I");
@@ -6567,7 +6567,7 @@ SHACTIVATEINFO *getSHACTIVATEINFOFields(JNIEnv *env, jobject lpObject, SHACTIVAT
 {
 	if (!SHACTIVATEINFOFc.cached) cacheSHACTIVATEINFOFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, SHACTIVATEINFOFc.cbSize);
-	lpStruct->hwndLastFocus = (HWND)(*env)->GetIntField(env, lpObject, SHACTIVATEINFOFc.hwndLastFocus);
+	lpStruct->hwndLastFocus = (HWND)(*env)->GetIntLongField(env, lpObject, SHACTIVATEINFOFc.hwndLastFocus);
 	lpStruct->fSipUp = (*env)->GetIntField(env, lpObject, SHACTIVATEINFOFc.fSipUp);
 	lpStruct->fSipOnDeactivation = (*env)->GetIntField(env, lpObject, SHACTIVATEINFOFc.fSipOnDeactivation);
 	lpStruct->fActive = (*env)->GetIntField(env, lpObject, SHACTIVATEINFOFc.fActive);
@@ -6579,7 +6579,7 @@ void setSHACTIVATEINFOFields(JNIEnv *env, jobject lpObject, SHACTIVATEINFO *lpSt
 {
 	if (!SHACTIVATEINFOFc.cached) cacheSHACTIVATEINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, SHACTIVATEINFOFc.cbSize, (jint)lpStruct->cbSize);
-	(*env)->SetIntField(env, lpObject, SHACTIVATEINFOFc.hwndLastFocus, (jint)lpStruct->hwndLastFocus);
+	(*env)->SetIntLongField(env, lpObject, SHACTIVATEINFOFc.hwndLastFocus, (jintLong)lpStruct->hwndLastFocus);
 	(*env)->SetIntField(env, lpObject, SHACTIVATEINFOFc.fSipUp, (jint)lpStruct->fSipUp);
 	(*env)->SetIntField(env, lpObject, SHACTIVATEINFOFc.fSipOnDeactivation, (jint)lpStruct->fSipOnDeactivation);
 	(*env)->SetIntField(env, lpObject, SHACTIVATEINFOFc.fActive, (jint)lpStruct->fActive);
@@ -6602,7 +6602,7 @@ void cacheSHDRAGIMAGEFields(JNIEnv *env, jobject lpObject)
 	SHDRAGIMAGEFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	SHDRAGIMAGEFc.sizeDragImage = (*env)->GetFieldID(env, SHDRAGIMAGEFc.clazz, "sizeDragImage", "Lorg/eclipse/swt/internal/win32/SIZE;");
 	SHDRAGIMAGEFc.ptOffset = (*env)->GetFieldID(env, SHDRAGIMAGEFc.clazz, "ptOffset", "Lorg/eclipse/swt/internal/win32/POINT;");
-	SHDRAGIMAGEFc.hbmpDragImage = (*env)->GetFieldID(env, SHDRAGIMAGEFc.clazz, "hbmpDragImage", "I");
+	SHDRAGIMAGEFc.hbmpDragImage = (*env)->GetFieldID(env, SHDRAGIMAGEFc.clazz, "hbmpDragImage", I_J);
 	SHDRAGIMAGEFc.crColorKey = (*env)->GetFieldID(env, SHDRAGIMAGEFc.clazz, "crColorKey", "I");
 	SHDRAGIMAGEFc.cached = 1;
 }
@@ -6618,7 +6618,7 @@ SHDRAGIMAGE *getSHDRAGIMAGEFields(JNIEnv *env, jobject lpObject, SHDRAGIMAGE *lp
 	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, SHDRAGIMAGEFc.ptOffset);
 	if (lpObject1 != NULL) getPOINTFields(env, lpObject1, &lpStruct->ptOffset);
 	}
-	lpStruct->hbmpDragImage = (HBITMAP)(*env)->GetIntField(env, lpObject, SHDRAGIMAGEFc.hbmpDragImage);
+	lpStruct->hbmpDragImage = (HBITMAP)(*env)->GetIntLongField(env, lpObject, SHDRAGIMAGEFc.hbmpDragImage);
 	lpStruct->crColorKey = (*env)->GetIntField(env, lpObject, SHDRAGIMAGEFc.crColorKey);
 	return lpStruct;
 }
@@ -6634,7 +6634,7 @@ void setSHDRAGIMAGEFields(JNIEnv *env, jobject lpObject, SHDRAGIMAGE *lpStruct)
 	jobject lpObject1 = (*env)->GetObjectField(env, lpObject, SHDRAGIMAGEFc.ptOffset);
 	if (lpObject1 != NULL) setPOINTFields(env, lpObject1, &lpStruct->ptOffset);
 	}
-	(*env)->SetIntField(env, lpObject, SHDRAGIMAGEFc.hbmpDragImage, (jint)lpStruct->hbmpDragImage);
+	(*env)->SetIntLongField(env, lpObject, SHDRAGIMAGEFc.hbmpDragImage, (jintLong)lpStruct->hbmpDragImage);
 	(*env)->SetIntField(env, lpObject, SHDRAGIMAGEFc.crColorKey, (jint)lpStruct->crColorKey);
 }
 #endif
@@ -6654,19 +6654,19 @@ void cacheSHELLEXECUTEINFOFields(JNIEnv *env, jobject lpObject)
 	SHELLEXECUTEINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	SHELLEXECUTEINFOFc.cbSize = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "cbSize", "I");
 	SHELLEXECUTEINFOFc.fMask = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "fMask", "I");
-	SHELLEXECUTEINFOFc.hwnd = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hwnd", "I");
-	SHELLEXECUTEINFOFc.lpVerb = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpVerb", "I");
-	SHELLEXECUTEINFOFc.lpFile = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpFile", "I");
-	SHELLEXECUTEINFOFc.lpParameters = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpParameters", "I");
-	SHELLEXECUTEINFOFc.lpDirectory = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpDirectory", "I");
+	SHELLEXECUTEINFOFc.hwnd = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hwnd", I_J);
+	SHELLEXECUTEINFOFc.lpVerb = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpVerb", I_J);
+	SHELLEXECUTEINFOFc.lpFile = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpFile", I_J);
+	SHELLEXECUTEINFOFc.lpParameters = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpParameters", I_J);
+	SHELLEXECUTEINFOFc.lpDirectory = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpDirectory", I_J);
 	SHELLEXECUTEINFOFc.nShow = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "nShow", "I");
-	SHELLEXECUTEINFOFc.hInstApp = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hInstApp", "I");
-	SHELLEXECUTEINFOFc.lpIDList = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpIDList", "I");
-	SHELLEXECUTEINFOFc.lpClass = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpClass", "I");
-	SHELLEXECUTEINFOFc.hkeyClass = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hkeyClass", "I");
+	SHELLEXECUTEINFOFc.hInstApp = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hInstApp", I_J);
+	SHELLEXECUTEINFOFc.lpIDList = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpIDList", I_J);
+	SHELLEXECUTEINFOFc.lpClass = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "lpClass", I_J);
+	SHELLEXECUTEINFOFc.hkeyClass = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hkeyClass", I_J);
 	SHELLEXECUTEINFOFc.dwHotKey = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "dwHotKey", "I");
-	SHELLEXECUTEINFOFc.hIcon = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hIcon", "I");
-	SHELLEXECUTEINFOFc.hProcess = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hProcess", "I");
+	SHELLEXECUTEINFOFc.hIcon = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hIcon", I_J);
+	SHELLEXECUTEINFOFc.hProcess = (*env)->GetFieldID(env, SHELLEXECUTEINFOFc.clazz, "hProcess", I_J);
 	SHELLEXECUTEINFOFc.cached = 1;
 }
 
@@ -6675,19 +6675,19 @@ SHELLEXECUTEINFO *getSHELLEXECUTEINFOFields(JNIEnv *env, jobject lpObject, SHELL
 	if (!SHELLEXECUTEINFOFc.cached) cacheSHELLEXECUTEINFOFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.cbSize);
 	lpStruct->fMask = (*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.fMask);
-	lpStruct->hwnd = (HWND)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.hwnd);
-	lpStruct->lpVerb = (LPCTSTR)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.lpVerb);
-	lpStruct->lpFile = (LPCTSTR)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.lpFile);
-	lpStruct->lpParameters = (LPCTSTR)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.lpParameters);
-	lpStruct->lpDirectory = (LPCTSTR)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.lpDirectory);
+	lpStruct->hwnd = (HWND)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hwnd);
+	lpStruct->lpVerb = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpVerb);
+	lpStruct->lpFile = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpFile);
+	lpStruct->lpParameters = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpParameters);
+	lpStruct->lpDirectory = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpDirectory);
 	lpStruct->nShow = (*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.nShow);
-	lpStruct->hInstApp = (HINSTANCE)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.hInstApp);
-	lpStruct->lpIDList = (LPVOID)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.lpIDList);
-	lpStruct->lpClass = (LPCTSTR)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.lpClass);
-	lpStruct->hkeyClass = (HKEY)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.hkeyClass);
+	lpStruct->hInstApp = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hInstApp);
+	lpStruct->lpIDList = (LPVOID)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpIDList);
+	lpStruct->lpClass = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpClass);
+	lpStruct->hkeyClass = (HKEY)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hkeyClass);
 	lpStruct->dwHotKey = (*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.dwHotKey);
-	lpStruct->hIcon = (HANDLE)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.hIcon);
-	lpStruct->hProcess = (HANDLE)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOFc.hProcess);
+	lpStruct->hIcon = (HANDLE)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hIcon);
+	lpStruct->hProcess = (HANDLE)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hProcess);
 	return lpStruct;
 }
 
@@ -6696,19 +6696,19 @@ void setSHELLEXECUTEINFOFields(JNIEnv *env, jobject lpObject, SHELLEXECUTEINFO *
 	if (!SHELLEXECUTEINFOFc.cached) cacheSHELLEXECUTEINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.cbSize, (jint)lpStruct->cbSize);
 	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.fMask, (jint)lpStruct->fMask);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.hwnd, (jint)lpStruct->hwnd);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.lpVerb, (jint)lpStruct->lpVerb);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.lpFile, (jint)lpStruct->lpFile);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.lpParameters, (jint)lpStruct->lpParameters);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.lpDirectory, (jint)lpStruct->lpDirectory);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hwnd, (jintLong)lpStruct->hwnd);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpVerb, (jintLong)lpStruct->lpVerb);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpFile, (jintLong)lpStruct->lpFile);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpParameters, (jintLong)lpStruct->lpParameters);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpDirectory, (jintLong)lpStruct->lpDirectory);
 	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.nShow, (jint)lpStruct->nShow);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.hInstApp, (jint)lpStruct->hInstApp);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.lpIDList, (jint)lpStruct->lpIDList);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.lpClass, (jint)lpStruct->lpClass);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.hkeyClass, (jint)lpStruct->hkeyClass);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hInstApp, (jintLong)lpStruct->hInstApp);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpIDList, (jintLong)lpStruct->lpIDList);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.lpClass, (jintLong)lpStruct->lpClass);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hkeyClass, (jintLong)lpStruct->hkeyClass);
 	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.dwHotKey, (jint)lpStruct->dwHotKey);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.hIcon, (jint)lpStruct->hIcon);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOFc.hProcess, (jint)lpStruct->hProcess);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hIcon, (jintLong)lpStruct->hIcon);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOFc.hProcess, (jintLong)lpStruct->hProcess);
 }
 #endif
 
@@ -6725,7 +6725,7 @@ void cacheSHFILEINFOFields(JNIEnv *env, jobject lpObject)
 {
 	if (SHFILEINFOFc.cached) return;
 	SHFILEINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	SHFILEINFOFc.hIcon = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "hIcon", "I");
+	SHFILEINFOFc.hIcon = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "hIcon", I_J);
 	SHFILEINFOFc.iIcon = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "iIcon", "I");
 	SHFILEINFOFc.dwAttributes = (*env)->GetFieldID(env, SHFILEINFOFc.clazz, "dwAttributes", "I");
 	SHFILEINFOFc.cached = 1;
@@ -6734,7 +6734,7 @@ void cacheSHFILEINFOFields(JNIEnv *env, jobject lpObject)
 SHFILEINFO *getSHFILEINFOFields(JNIEnv *env, jobject lpObject, SHFILEINFO *lpStruct)
 {
 	if (!SHFILEINFOFc.cached) cacheSHFILEINFOFields(env, lpObject);
-	lpStruct->hIcon = (HICON)(*env)->GetIntField(env, lpObject, SHFILEINFOFc.hIcon);
+	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, SHFILEINFOFc.hIcon);
 	lpStruct->iIcon = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.iIcon);
 	lpStruct->dwAttributes = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.dwAttributes);
 	return lpStruct;
@@ -6743,7 +6743,7 @@ SHFILEINFO *getSHFILEINFOFields(JNIEnv *env, jobject lpObject, SHFILEINFO *lpStr
 void setSHFILEINFOFields(JNIEnv *env, jobject lpObject, SHFILEINFO *lpStruct)
 {
 	if (!SHFILEINFOFc.cached) cacheSHFILEINFOFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.hIcon, (jint)lpStruct->hIcon);
+	(*env)->SetIntLongField(env, lpObject, SHFILEINFOFc.hIcon, (jintLong)lpStruct->hIcon);
 	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.iIcon, (jint)lpStruct->iIcon);
 	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.dwAttributes, (jint)lpStruct->dwAttributes);
 }
@@ -6771,7 +6771,7 @@ void cacheSHFILEINFOAFields(JNIEnv *env, jobject lpObject)
 SHFILEINFOA *getSHFILEINFOAFields(JNIEnv *env, jobject lpObject, SHFILEINFOA *lpStruct)
 {
 	if (!SHFILEINFOAFc.cached) cacheSHFILEINFOAFields(env, lpObject);
-	lpStruct->hIcon = (HICON)(*env)->GetIntField(env, lpObject, SHFILEINFOFc.hIcon);
+	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, SHFILEINFOFc.hIcon);
 	lpStruct->iIcon = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.iIcon);
 	lpStruct->dwAttributes = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.dwAttributes);
 	{
@@ -6788,7 +6788,7 @@ SHFILEINFOA *getSHFILEINFOAFields(JNIEnv *env, jobject lpObject, SHFILEINFOA *lp
 void setSHFILEINFOAFields(JNIEnv *env, jobject lpObject, SHFILEINFOA *lpStruct)
 {
 	if (!SHFILEINFOAFc.cached) cacheSHFILEINFOAFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.hIcon, (jint)lpStruct->hIcon);
+	(*env)->SetIntLongField(env, lpObject, SHFILEINFOFc.hIcon, (jintLong)lpStruct->hIcon);
 	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.iIcon, (jint)lpStruct->iIcon);
 	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.dwAttributes, (jint)lpStruct->dwAttributes);
 	{
@@ -6824,16 +6824,16 @@ void cacheSHFILEINFOWFields(JNIEnv *env, jobject lpObject)
 SHFILEINFOW *getSHFILEINFOWFields(JNIEnv *env, jobject lpObject, SHFILEINFOW *lpStruct)
 {
 	if (!SHFILEINFOWFc.cached) cacheSHFILEINFOWFields(env, lpObject);
-	lpStruct->hIcon = (HICON)(*env)->GetIntField(env, lpObject, SHFILEINFOFc.hIcon);
+	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, SHFILEINFOFc.hIcon);
 	lpStruct->iIcon = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.iIcon);
 	lpStruct->dwAttributes = (*env)->GetIntField(env, lpObject, SHFILEINFOFc.dwAttributes);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOWFc.szDisplayName);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szDisplayName) / 2, (jchar *)lpStruct->szDisplayName);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szDisplayName) / sizeof(jchar), (jchar *)lpStruct->szDisplayName);
 	}
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOWFc.szTypeName);
-	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTypeName) / 2, (jchar *)lpStruct->szTypeName);
+	(*env)->GetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTypeName) / sizeof(jchar), (jchar *)lpStruct->szTypeName);
 	}
 	return lpStruct;
 }
@@ -6841,16 +6841,16 @@ SHFILEINFOW *getSHFILEINFOWFields(JNIEnv *env, jobject lpObject, SHFILEINFOW *lp
 void setSHFILEINFOWFields(JNIEnv *env, jobject lpObject, SHFILEINFOW *lpStruct)
 {
 	if (!SHFILEINFOWFc.cached) cacheSHFILEINFOWFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.hIcon, (jint)lpStruct->hIcon);
+	(*env)->SetIntLongField(env, lpObject, SHFILEINFOFc.hIcon, (jintLong)lpStruct->hIcon);
 	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.iIcon, (jint)lpStruct->iIcon);
 	(*env)->SetIntField(env, lpObject, SHFILEINFOFc.dwAttributes, (jint)lpStruct->dwAttributes);
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOWFc.szDisplayName);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szDisplayName) / 2, (jchar *)lpStruct->szDisplayName);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szDisplayName) / sizeof(jchar), (jchar *)lpStruct->szDisplayName);
 	}
 	{
 	jcharArray lpObject1 = (jcharArray)(*env)->GetObjectField(env, lpObject, SHFILEINFOWFc.szTypeName);
-	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTypeName) / 2, (jchar *)lpStruct->szTypeName);
+	(*env)->SetCharArrayRegion(env, lpObject1, 0, sizeof(lpStruct->szTypeName) / sizeof(jchar), (jchar *)lpStruct->szTypeName);
 	}
 }
 #endif
@@ -6869,13 +6869,13 @@ void cacheSHMENUBARINFOFields(JNIEnv *env, jobject lpObject)
 	if (SHMENUBARINFOFc.cached) return;
 	SHMENUBARINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	SHMENUBARINFOFc.cbSize = (*env)->GetFieldID(env, SHMENUBARINFOFc.clazz, "cbSize", "I");
-	SHMENUBARINFOFc.hwndParent = (*env)->GetFieldID(env, SHMENUBARINFOFc.clazz, "hwndParent", "I");
+	SHMENUBARINFOFc.hwndParent = (*env)->GetFieldID(env, SHMENUBARINFOFc.clazz, "hwndParent", I_J);
 	SHMENUBARINFOFc.dwFlags = (*env)->GetFieldID(env, SHMENUBARINFOFc.clazz, "dwFlags", "I");
 	SHMENUBARINFOFc.nToolBarId = (*env)->GetFieldID(env, SHMENUBARINFOFc.clazz, "nToolBarId", "I");
-	SHMENUBARINFOFc.hInstRes = (*env)->GetFieldID(env, SHMENUBARINFOFc.clazz, "hInstRes", "I");
+	SHMENUBARINFOFc.hInstRes = (*env)->GetFieldID(env, SHMENUBARINFOFc.clazz, "hInstRes", I_J);
 	SHMENUBARINFOFc.nBmpId = (*env)->GetFieldID(env, SHMENUBARINFOFc.clazz, "nBmpId", "I");
 	SHMENUBARINFOFc.cBmpImages = (*env)->GetFieldID(env, SHMENUBARINFOFc.clazz, "cBmpImages", "I");
-	SHMENUBARINFOFc.hwndMB = (*env)->GetFieldID(env, SHMENUBARINFOFc.clazz, "hwndMB", "I");
+	SHMENUBARINFOFc.hwndMB = (*env)->GetFieldID(env, SHMENUBARINFOFc.clazz, "hwndMB", I_J);
 	SHMENUBARINFOFc.cached = 1;
 }
 
@@ -6883,13 +6883,13 @@ SHMENUBARINFO *getSHMENUBARINFOFields(JNIEnv *env, jobject lpObject, SHMENUBARIN
 {
 	if (!SHMENUBARINFOFc.cached) cacheSHMENUBARINFOFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, SHMENUBARINFOFc.cbSize);
-	lpStruct->hwndParent = (HWND)(*env)->GetIntField(env, lpObject, SHMENUBARINFOFc.hwndParent);
+	lpStruct->hwndParent = (HWND)(*env)->GetIntLongField(env, lpObject, SHMENUBARINFOFc.hwndParent);
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, SHMENUBARINFOFc.dwFlags);
 	lpStruct->nToolBarId = (*env)->GetIntField(env, lpObject, SHMENUBARINFOFc.nToolBarId);
-	lpStruct->hInstRes = (HINSTANCE)(*env)->GetIntField(env, lpObject, SHMENUBARINFOFc.hInstRes);
+	lpStruct->hInstRes = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, SHMENUBARINFOFc.hInstRes);
 	lpStruct->nBmpId = (*env)->GetIntField(env, lpObject, SHMENUBARINFOFc.nBmpId);
 	lpStruct->cBmpImages = (*env)->GetIntField(env, lpObject, SHMENUBARINFOFc.cBmpImages);
-	lpStruct->hwndMB = (HWND)(*env)->GetIntField(env, lpObject, SHMENUBARINFOFc.hwndMB);
+	lpStruct->hwndMB = (HWND)(*env)->GetIntLongField(env, lpObject, SHMENUBARINFOFc.hwndMB);
 	return lpStruct;
 }
 
@@ -6897,13 +6897,13 @@ void setSHMENUBARINFOFields(JNIEnv *env, jobject lpObject, SHMENUBARINFO *lpStru
 {
 	if (!SHMENUBARINFOFc.cached) cacheSHMENUBARINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, SHMENUBARINFOFc.cbSize, (jint)lpStruct->cbSize);
-	(*env)->SetIntField(env, lpObject, SHMENUBARINFOFc.hwndParent, (jint)lpStruct->hwndParent);
+	(*env)->SetIntLongField(env, lpObject, SHMENUBARINFOFc.hwndParent, (jintLong)lpStruct->hwndParent);
 	(*env)->SetIntField(env, lpObject, SHMENUBARINFOFc.dwFlags, (jint)lpStruct->dwFlags);
 	(*env)->SetIntField(env, lpObject, SHMENUBARINFOFc.nToolBarId, (jint)lpStruct->nToolBarId);
-	(*env)->SetIntField(env, lpObject, SHMENUBARINFOFc.hInstRes, (jint)lpStruct->hInstRes);
+	(*env)->SetIntLongField(env, lpObject, SHMENUBARINFOFc.hInstRes, (jintLong)lpStruct->hInstRes);
 	(*env)->SetIntField(env, lpObject, SHMENUBARINFOFc.nBmpId, (jint)lpStruct->nBmpId);
 	(*env)->SetIntField(env, lpObject, SHMENUBARINFOFc.cBmpImages, (jint)lpStruct->cBmpImages);
-	(*env)->SetIntField(env, lpObject, SHMENUBARINFOFc.hwndMB, (jint)lpStruct->hwndMB);
+	(*env)->SetIntLongField(env, lpObject, SHMENUBARINFOFc.hwndMB, (jintLong)lpStruct->hwndMB);
 }
 #endif
 
@@ -6921,7 +6921,7 @@ void cacheSHRGINFOFields(JNIEnv *env, jobject lpObject)
 	if (SHRGINFOFc.cached) return;
 	SHRGINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	SHRGINFOFc.cbSize = (*env)->GetFieldID(env, SHRGINFOFc.clazz, "cbSize", "I");
-	SHRGINFOFc.hwndClient = (*env)->GetFieldID(env, SHRGINFOFc.clazz, "hwndClient", "I");
+	SHRGINFOFc.hwndClient = (*env)->GetFieldID(env, SHRGINFOFc.clazz, "hwndClient", I_J);
 	SHRGINFOFc.ptDown_x = (*env)->GetFieldID(env, SHRGINFOFc.clazz, "ptDown_x", "I");
 	SHRGINFOFc.ptDown_y = (*env)->GetFieldID(env, SHRGINFOFc.clazz, "ptDown_y", "I");
 	SHRGINFOFc.dwFlags = (*env)->GetFieldID(env, SHRGINFOFc.clazz, "dwFlags", "I");
@@ -6932,7 +6932,7 @@ SHRGINFO *getSHRGINFOFields(JNIEnv *env, jobject lpObject, SHRGINFO *lpStruct)
 {
 	if (!SHRGINFOFc.cached) cacheSHRGINFOFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, SHRGINFOFc.cbSize);
-	lpStruct->hwndClient = (HWND)(*env)->GetIntField(env, lpObject, SHRGINFOFc.hwndClient);
+	lpStruct->hwndClient = (HWND)(*env)->GetIntLongField(env, lpObject, SHRGINFOFc.hwndClient);
 	lpStruct->ptDown.x = (*env)->GetIntField(env, lpObject, SHRGINFOFc.ptDown_x);
 	lpStruct->ptDown.y = (*env)->GetIntField(env, lpObject, SHRGINFOFc.ptDown_y);
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, SHRGINFOFc.dwFlags);
@@ -6943,7 +6943,7 @@ void setSHRGINFOFields(JNIEnv *env, jobject lpObject, SHRGINFO *lpStruct)
 {
 	if (!SHRGINFOFc.cached) cacheSHRGINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, SHRGINFOFc.cbSize, (jint)lpStruct->cbSize);
-	(*env)->SetIntField(env, lpObject, SHRGINFOFc.hwndClient, (jint)lpStruct->hwndClient);
+	(*env)->SetIntLongField(env, lpObject, SHRGINFOFc.hwndClient, (jintLong)lpStruct->hwndClient);
 	(*env)->SetIntField(env, lpObject, SHRGINFOFc.ptDown_x, (jint)lpStruct->ptDown.x);
 	(*env)->SetIntField(env, lpObject, SHRGINFOFc.ptDown_y, (jint)lpStruct->ptDown.y);
 	(*env)->SetIntField(env, lpObject, SHRGINFOFc.dwFlags, (jint)lpStruct->dwFlags);
@@ -6974,7 +6974,7 @@ void cacheSIPINFOFields(JNIEnv *env, jobject lpObject)
 	SIPINFOFc.rcSipRect_right = (*env)->GetFieldID(env, SIPINFOFc.clazz, "rcSipRect_right", "I");
 	SIPINFOFc.rcSipRect_bottom = (*env)->GetFieldID(env, SIPINFOFc.clazz, "rcSipRect_bottom", "I");
 	SIPINFOFc.dwImDataSize = (*env)->GetFieldID(env, SIPINFOFc.clazz, "dwImDataSize", "I");
-	SIPINFOFc.pvImData = (*env)->GetFieldID(env, SIPINFOFc.clazz, "pvImData", "I");
+	SIPINFOFc.pvImData = (*env)->GetFieldID(env, SIPINFOFc.clazz, "pvImData", I_J);
 	SIPINFOFc.cached = 1;
 }
 
@@ -6992,7 +6992,7 @@ SIPINFO *getSIPINFOFields(JNIEnv *env, jobject lpObject, SIPINFO *lpStruct)
 	lpStruct->rcSipRect.right = (*env)->GetIntField(env, lpObject, SIPINFOFc.rcSipRect_right);
 	lpStruct->rcSipRect.bottom = (*env)->GetIntField(env, lpObject, SIPINFOFc.rcSipRect_bottom);
 	lpStruct->dwImDataSize = (*env)->GetIntField(env, lpObject, SIPINFOFc.dwImDataSize);
-	lpStruct->pvImData = (void *)(*env)->GetIntField(env, lpObject, SIPINFOFc.pvImData);
+	lpStruct->pvImData = (void *)(*env)->GetIntLongField(env, lpObject, SIPINFOFc.pvImData);
 	return lpStruct;
 }
 
@@ -7010,7 +7010,7 @@ void setSIPINFOFields(JNIEnv *env, jobject lpObject, SIPINFO *lpStruct)
 	(*env)->SetIntField(env, lpObject, SIPINFOFc.rcSipRect_right, (jint)lpStruct->rcSipRect.right);
 	(*env)->SetIntField(env, lpObject, SIPINFOFc.rcSipRect_bottom, (jint)lpStruct->rcSipRect.bottom);
 	(*env)->SetIntField(env, lpObject, SIPINFOFc.dwImDataSize, (jint)lpStruct->dwImDataSize);
-	(*env)->SetIntField(env, lpObject, SIPINFOFc.pvImData, (jint)lpStruct->pvImData);
+	(*env)->SetIntLongField(env, lpObject, SIPINFOFc.pvImData, (jintLong)lpStruct->pvImData);
 }
 #endif
 
@@ -7062,9 +7062,9 @@ void cacheSTARTUPINFOFields(JNIEnv *env, jobject lpObject)
 	if (STARTUPINFOFc.cached) return;
 	STARTUPINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	STARTUPINFOFc.cb = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "cb", "I");
-	STARTUPINFOFc.lpReserved = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpReserved", "I");
-	STARTUPINFOFc.lpDesktop = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpDesktop", "I");
-	STARTUPINFOFc.lpTitle = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpTitle", "I");
+	STARTUPINFOFc.lpReserved = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpReserved", I_J);
+	STARTUPINFOFc.lpDesktop = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpDesktop", I_J);
+	STARTUPINFOFc.lpTitle = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpTitle", I_J);
 	STARTUPINFOFc.dwX = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "dwX", "I");
 	STARTUPINFOFc.dwY = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "dwY", "I");
 	STARTUPINFOFc.dwXSize = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "dwXSize", "I");
@@ -7075,10 +7075,10 @@ void cacheSTARTUPINFOFields(JNIEnv *env, jobject lpObject)
 	STARTUPINFOFc.dwFlags = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "dwFlags", "I");
 	STARTUPINFOFc.wShowWindow = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "wShowWindow", "S");
 	STARTUPINFOFc.cbReserved2 = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "cbReserved2", "S");
-	STARTUPINFOFc.lpReserved2 = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpReserved2", "I");
-	STARTUPINFOFc.hStdInput = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "hStdInput", "I");
-	STARTUPINFOFc.hStdOutput = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "hStdOutput", "I");
-	STARTUPINFOFc.hStdError = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "hStdError", "I");
+	STARTUPINFOFc.lpReserved2 = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "lpReserved2", I_J);
+	STARTUPINFOFc.hStdInput = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "hStdInput", I_J);
+	STARTUPINFOFc.hStdOutput = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "hStdOutput", I_J);
+	STARTUPINFOFc.hStdError = (*env)->GetFieldID(env, STARTUPINFOFc.clazz, "hStdError", I_J);
 	STARTUPINFOFc.cached = 1;
 }
 
@@ -7086,9 +7086,9 @@ STARTUPINFO *getSTARTUPINFOFields(JNIEnv *env, jobject lpObject, STARTUPINFO *lp
 {
 	if (!STARTUPINFOFc.cached) cacheSTARTUPINFOFields(env, lpObject);
 	lpStruct->cb = (*env)->GetIntField(env, lpObject, STARTUPINFOFc.cb);
-	lpStruct->lpReserved = (LPTSTR)(*env)->GetIntField(env, lpObject, STARTUPINFOFc.lpReserved);
-	lpStruct->lpDesktop = (LPTSTR)(*env)->GetIntField(env, lpObject, STARTUPINFOFc.lpDesktop);
-	lpStruct->lpTitle = (LPTSTR)(*env)->GetIntField(env, lpObject, STARTUPINFOFc.lpTitle);
+	lpStruct->lpReserved = (LPTSTR)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.lpReserved);
+	lpStruct->lpDesktop = (LPTSTR)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.lpDesktop);
+	lpStruct->lpTitle = (LPTSTR)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.lpTitle);
 	lpStruct->dwX = (*env)->GetIntField(env, lpObject, STARTUPINFOFc.dwX);
 	lpStruct->dwY = (*env)->GetIntField(env, lpObject, STARTUPINFOFc.dwY);
 	lpStruct->dwXSize = (*env)->GetIntField(env, lpObject, STARTUPINFOFc.dwXSize);
@@ -7099,10 +7099,10 @@ STARTUPINFO *getSTARTUPINFOFields(JNIEnv *env, jobject lpObject, STARTUPINFO *lp
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, STARTUPINFOFc.dwFlags);
 	lpStruct->wShowWindow = (*env)->GetShortField(env, lpObject, STARTUPINFOFc.wShowWindow);
 	lpStruct->cbReserved2 = (*env)->GetShortField(env, lpObject, STARTUPINFOFc.cbReserved2);
-	lpStruct->lpReserved2 = (LPBYTE)(*env)->GetIntField(env, lpObject, STARTUPINFOFc.lpReserved2);
-	lpStruct->hStdInput = (HANDLE)(*env)->GetIntField(env, lpObject, STARTUPINFOFc.hStdInput);
-	lpStruct->hStdOutput = (HANDLE)(*env)->GetIntField(env, lpObject, STARTUPINFOFc.hStdOutput);
-	lpStruct->hStdError = (HANDLE)(*env)->GetIntField(env, lpObject, STARTUPINFOFc.hStdError);
+	lpStruct->lpReserved2 = (LPBYTE)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.lpReserved2);
+	lpStruct->hStdInput = (HANDLE)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.hStdInput);
+	lpStruct->hStdOutput = (HANDLE)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.hStdOutput);
+	lpStruct->hStdError = (HANDLE)(*env)->GetIntLongField(env, lpObject, STARTUPINFOFc.hStdError);
 	return lpStruct;
 }
 
@@ -7110,9 +7110,9 @@ void setSTARTUPINFOFields(JNIEnv *env, jobject lpObject, STARTUPINFO *lpStruct)
 {
 	if (!STARTUPINFOFc.cached) cacheSTARTUPINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, STARTUPINFOFc.cb, (jint)lpStruct->cb);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOFc.lpReserved, (jint)lpStruct->lpReserved);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOFc.lpDesktop, (jint)lpStruct->lpDesktop);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOFc.lpTitle, (jint)lpStruct->lpTitle);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.lpReserved, (jintLong)lpStruct->lpReserved);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.lpDesktop, (jintLong)lpStruct->lpDesktop);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.lpTitle, (jintLong)lpStruct->lpTitle);
 	(*env)->SetIntField(env, lpObject, STARTUPINFOFc.dwX, (jint)lpStruct->dwX);
 	(*env)->SetIntField(env, lpObject, STARTUPINFOFc.dwY, (jint)lpStruct->dwY);
 	(*env)->SetIntField(env, lpObject, STARTUPINFOFc.dwXSize, (jint)lpStruct->dwXSize);
@@ -7123,10 +7123,10 @@ void setSTARTUPINFOFields(JNIEnv *env, jobject lpObject, STARTUPINFO *lpStruct)
 	(*env)->SetIntField(env, lpObject, STARTUPINFOFc.dwFlags, (jint)lpStruct->dwFlags);
 	(*env)->SetShortField(env, lpObject, STARTUPINFOFc.wShowWindow, (jshort)lpStruct->wShowWindow);
 	(*env)->SetShortField(env, lpObject, STARTUPINFOFc.cbReserved2, (jshort)lpStruct->cbReserved2);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOFc.lpReserved2, (jint)lpStruct->lpReserved2);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOFc.hStdInput, (jint)lpStruct->hStdInput);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOFc.hStdOutput, (jint)lpStruct->hStdOutput);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOFc.hStdError, (jint)lpStruct->hStdError);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.lpReserved2, (jintLong)lpStruct->lpReserved2);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.hStdInput, (jintLong)lpStruct->hStdInput);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.hStdOutput, (jintLong)lpStruct->hStdOutput);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOFc.hStdError, (jintLong)lpStruct->hStdError);
 }
 #endif
 
@@ -7199,8 +7199,8 @@ void cacheTBBUTTONFields(JNIEnv *env, jobject lpObject)
 	TBBUTTONFc.idCommand = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "idCommand", "I");
 	TBBUTTONFc.fsState = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "fsState", "B");
 	TBBUTTONFc.fsStyle = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "fsStyle", "B");
-	TBBUTTONFc.dwData = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "dwData", "I");
-	TBBUTTONFc.iString = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "iString", "I");
+	TBBUTTONFc.dwData = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "dwData", I_J);
+	TBBUTTONFc.iString = (*env)->GetFieldID(env, TBBUTTONFc.clazz, "iString", I_J);
 	TBBUTTONFc.cached = 1;
 }
 
@@ -7211,8 +7211,8 @@ TBBUTTON *getTBBUTTONFields(JNIEnv *env, jobject lpObject, TBBUTTON *lpStruct)
 	lpStruct->idCommand = (*env)->GetIntField(env, lpObject, TBBUTTONFc.idCommand);
 	lpStruct->fsState = (*env)->GetByteField(env, lpObject, TBBUTTONFc.fsState);
 	lpStruct->fsStyle = (*env)->GetByteField(env, lpObject, TBBUTTONFc.fsStyle);
-	lpStruct->dwData = (*env)->GetIntField(env, lpObject, TBBUTTONFc.dwData);
-	lpStruct->iString = (*env)->GetIntField(env, lpObject, TBBUTTONFc.iString);
+	lpStruct->dwData = (*env)->GetIntLongField(env, lpObject, TBBUTTONFc.dwData);
+	lpStruct->iString = (*env)->GetIntLongField(env, lpObject, TBBUTTONFc.iString);
 	return lpStruct;
 }
 
@@ -7223,8 +7223,8 @@ void setTBBUTTONFields(JNIEnv *env, jobject lpObject, TBBUTTON *lpStruct)
 	(*env)->SetIntField(env, lpObject, TBBUTTONFc.idCommand, (jint)lpStruct->idCommand);
 	(*env)->SetByteField(env, lpObject, TBBUTTONFc.fsState, (jbyte)lpStruct->fsState);
 	(*env)->SetByteField(env, lpObject, TBBUTTONFc.fsStyle, (jbyte)lpStruct->fsStyle);
-	(*env)->SetIntField(env, lpObject, TBBUTTONFc.dwData, (jint)lpStruct->dwData);
-	(*env)->SetIntField(env, lpObject, TBBUTTONFc.iString, (jint)lpStruct->iString);
+	(*env)->SetIntLongField(env, lpObject, TBBUTTONFc.dwData, (jintLong)lpStruct->dwData);
+	(*env)->SetIntLongField(env, lpObject, TBBUTTONFc.iString, (jintLong)lpStruct->iString);
 }
 #endif
 
@@ -7248,8 +7248,8 @@ void cacheTBBUTTONINFOFields(JNIEnv *env, jobject lpObject)
 	TBBUTTONINFOFc.fsState = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "fsState", "B");
 	TBBUTTONINFOFc.fsStyle = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "fsStyle", "B");
 	TBBUTTONINFOFc.cx = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "cx", "S");
-	TBBUTTONINFOFc.lParam = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "lParam", "I");
-	TBBUTTONINFOFc.pszText = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "pszText", "I");
+	TBBUTTONINFOFc.lParam = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "lParam", I_J);
+	TBBUTTONINFOFc.pszText = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "pszText", I_J);
 	TBBUTTONINFOFc.cchText = (*env)->GetFieldID(env, TBBUTTONINFOFc.clazz, "cchText", "I");
 	TBBUTTONINFOFc.cached = 1;
 }
@@ -7264,8 +7264,8 @@ TBBUTTONINFO *getTBBUTTONINFOFields(JNIEnv *env, jobject lpObject, TBBUTTONINFO
 	lpStruct->fsState = (*env)->GetByteField(env, lpObject, TBBUTTONINFOFc.fsState);
 	lpStruct->fsStyle = (*env)->GetByteField(env, lpObject, TBBUTTONINFOFc.fsStyle);
 	lpStruct->cx = (*env)->GetShortField(env, lpObject, TBBUTTONINFOFc.cx);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, TBBUTTONINFOFc.lParam);
-	lpStruct->pszText = (LPTSTR)(*env)->GetIntField(env, lpObject, TBBUTTONINFOFc.pszText);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, TBBUTTONINFOFc.lParam);
+	lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, TBBUTTONINFOFc.pszText);
 	lpStruct->cchText = (*env)->GetIntField(env, lpObject, TBBUTTONINFOFc.cchText);
 	return lpStruct;
 }
@@ -7280,8 +7280,8 @@ void setTBBUTTONINFOFields(JNIEnv *env, jobject lpObject, TBBUTTONINFO *lpStruct
 	(*env)->SetByteField(env, lpObject, TBBUTTONINFOFc.fsState, (jbyte)lpStruct->fsState);
 	(*env)->SetByteField(env, lpObject, TBBUTTONINFOFc.fsStyle, (jbyte)lpStruct->fsStyle);
 	(*env)->SetShortField(env, lpObject, TBBUTTONINFOFc.cx, (jshort)lpStruct->cx);
-	(*env)->SetIntField(env, lpObject, TBBUTTONINFOFc.lParam, (jint)lpStruct->lParam);
-	(*env)->SetIntField(env, lpObject, TBBUTTONINFOFc.pszText, (jint)lpStruct->pszText);
+	(*env)->SetIntLongField(env, lpObject, TBBUTTONINFOFc.lParam, (jintLong)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, TBBUTTONINFOFc.pszText, (jintLong)lpStruct->pszText);
 	(*env)->SetIntField(env, lpObject, TBBUTTONINFOFc.cchText, (jint)lpStruct->cchText);
 }
 #endif
@@ -7339,10 +7339,10 @@ void cacheTCITEMFields(JNIEnv *env, jobject lpObject)
 	TCITEMFc.mask = (*env)->GetFieldID(env, TCITEMFc.clazz, "mask", "I");
 	TCITEMFc.dwState = (*env)->GetFieldID(env, TCITEMFc.clazz, "dwState", "I");
 	TCITEMFc.dwStateMask = (*env)->GetFieldID(env, TCITEMFc.clazz, "dwStateMask", "I");
-	TCITEMFc.pszText = (*env)->GetFieldID(env, TCITEMFc.clazz, "pszText", "I");
+	TCITEMFc.pszText = (*env)->GetFieldID(env, TCITEMFc.clazz, "pszText", I_J);
 	TCITEMFc.cchTextMax = (*env)->GetFieldID(env, TCITEMFc.clazz, "cchTextMax", "I");
 	TCITEMFc.iImage = (*env)->GetFieldID(env, TCITEMFc.clazz, "iImage", "I");
-	TCITEMFc.lParam = (*env)->GetFieldID(env, TCITEMFc.clazz, "lParam", "I");
+	TCITEMFc.lParam = (*env)->GetFieldID(env, TCITEMFc.clazz, "lParam", I_J);
 	TCITEMFc.cached = 1;
 }
 
@@ -7352,10 +7352,10 @@ TCITEM *getTCITEMFields(JNIEnv *env, jobject lpObject, TCITEM *lpStruct)
 	lpStruct->mask = (*env)->GetIntField(env, lpObject, TCITEMFc.mask);
 	lpStruct->dwState = (*env)->GetIntField(env, lpObject, TCITEMFc.dwState);
 	lpStruct->dwStateMask = (*env)->GetIntField(env, lpObject, TCITEMFc.dwStateMask);
-	lpStruct->pszText = (LPTSTR)(*env)->GetIntField(env, lpObject, TCITEMFc.pszText);
+	lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, TCITEMFc.pszText);
 	lpStruct->cchTextMax = (*env)->GetIntField(env, lpObject, TCITEMFc.cchTextMax);
 	lpStruct->iImage = (*env)->GetIntField(env, lpObject, TCITEMFc.iImage);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, TCITEMFc.lParam);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, TCITEMFc.lParam);
 	return lpStruct;
 }
 
@@ -7365,10 +7365,10 @@ void setTCITEMFields(JNIEnv *env, jobject lpObject, TCITEM *lpStruct)
 	(*env)->SetIntField(env, lpObject, TCITEMFc.mask, (jint)lpStruct->mask);
 	(*env)->SetIntField(env, lpObject, TCITEMFc.dwState, (jint)lpStruct->dwState);
 	(*env)->SetIntField(env, lpObject, TCITEMFc.dwStateMask, (jint)lpStruct->dwStateMask);
-	(*env)->SetIntField(env, lpObject, TCITEMFc.pszText, (jint)lpStruct->pszText);
+	(*env)->SetIntLongField(env, lpObject, TCITEMFc.pszText, (jintLong)lpStruct->pszText);
 	(*env)->SetIntField(env, lpObject, TCITEMFc.cchTextMax, (jint)lpStruct->cchTextMax);
 	(*env)->SetIntField(env, lpObject, TCITEMFc.iImage, (jint)lpStruct->iImage);
-	(*env)->SetIntField(env, lpObject, TCITEMFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, TCITEMFc.lParam, (jintLong)lpStruct->lParam);
 }
 #endif
 
@@ -7707,16 +7707,16 @@ void cacheTOOLINFOFields(JNIEnv *env, jobject lpObject)
 	TOOLINFOFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	TOOLINFOFc.cbSize = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "cbSize", "I");
 	TOOLINFOFc.uFlags = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "uFlags", "I");
-	TOOLINFOFc.hwnd = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "hwnd", "I");
-	TOOLINFOFc.uId = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "uId", "I");
+	TOOLINFOFc.hwnd = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "hwnd", I_J);
+	TOOLINFOFc.uId = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "uId", I_J);
 	TOOLINFOFc.left = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "left", "I");
 	TOOLINFOFc.top = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "top", "I");
 	TOOLINFOFc.right = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "right", "I");
 	TOOLINFOFc.bottom = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "bottom", "I");
-	TOOLINFOFc.hinst = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "hinst", "I");
-	TOOLINFOFc.lpszText = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lpszText", "I");
-	TOOLINFOFc.lParam = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lParam", "I");
-	TOOLINFOFc.lpReserved = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lpReserved", "I");
+	TOOLINFOFc.hinst = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "hinst", I_J);
+	TOOLINFOFc.lpszText = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lpszText", I_J);
+	TOOLINFOFc.lParam = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lParam", I_J);
+	TOOLINFOFc.lpReserved = (*env)->GetFieldID(env, TOOLINFOFc.clazz, "lpReserved", I_J);
 	TOOLINFOFc.cached = 1;
 }
 
@@ -7725,16 +7725,16 @@ TOOLINFO *getTOOLINFOFields(JNIEnv *env, jobject lpObject, TOOLINFO *lpStruct)
 	if (!TOOLINFOFc.cached) cacheTOOLINFOFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, TOOLINFOFc.cbSize);
 	lpStruct->uFlags = (*env)->GetIntField(env, lpObject, TOOLINFOFc.uFlags);
-	lpStruct->hwnd = (HWND)(*env)->GetIntField(env, lpObject, TOOLINFOFc.hwnd);
-	lpStruct->uId = (*env)->GetIntField(env, lpObject, TOOLINFOFc.uId);
+	lpStruct->hwnd = (HWND)(*env)->GetIntLongField(env, lpObject, TOOLINFOFc.hwnd);
+	lpStruct->uId = (*env)->GetIntLongField(env, lpObject, TOOLINFOFc.uId);
 	lpStruct->rect.left = (*env)->GetIntField(env, lpObject, TOOLINFOFc.left);
 	lpStruct->rect.top = (*env)->GetIntField(env, lpObject, TOOLINFOFc.top);
 	lpStruct->rect.right = (*env)->GetIntField(env, lpObject, TOOLINFOFc.right);
 	lpStruct->rect.bottom = (*env)->GetIntField(env, lpObject, TOOLINFOFc.bottom);
-	lpStruct->hinst = (HINSTANCE)(*env)->GetIntField(env, lpObject, TOOLINFOFc.hinst);
-	lpStruct->lpszText = (LPTSTR)(*env)->GetIntField(env, lpObject, TOOLINFOFc.lpszText);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, TOOLINFOFc.lParam);
-	lpStruct->lpReserved = (void *)(*env)->GetIntField(env, lpObject, TOOLINFOFc.lpReserved);
+	lpStruct->hinst = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, TOOLINFOFc.hinst);
+	lpStruct->lpszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, TOOLINFOFc.lpszText);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, TOOLINFOFc.lParam);
+	lpStruct->lpReserved = (void *)(*env)->GetIntLongField(env, lpObject, TOOLINFOFc.lpReserved);
 	return lpStruct;
 }
 
@@ -7743,16 +7743,16 @@ void setTOOLINFOFields(JNIEnv *env, jobject lpObject, TOOLINFO *lpStruct)
 	if (!TOOLINFOFc.cached) cacheTOOLINFOFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, TOOLINFOFc.cbSize, (jint)lpStruct->cbSize);
 	(*env)->SetIntField(env, lpObject, TOOLINFOFc.uFlags, (jint)lpStruct->uFlags);
-	(*env)->SetIntField(env, lpObject, TOOLINFOFc.hwnd, (jint)lpStruct->hwnd);
-	(*env)->SetIntField(env, lpObject, TOOLINFOFc.uId, (jint)lpStruct->uId);
+	(*env)->SetIntLongField(env, lpObject, TOOLINFOFc.hwnd, (jintLong)lpStruct->hwnd);
+	(*env)->SetIntLongField(env, lpObject, TOOLINFOFc.uId, (jintLong)lpStruct->uId);
 	(*env)->SetIntField(env, lpObject, TOOLINFOFc.left, (jint)lpStruct->rect.left);
 	(*env)->SetIntField(env, lpObject, TOOLINFOFc.top, (jint)lpStruct->rect.top);
 	(*env)->SetIntField(env, lpObject, TOOLINFOFc.right, (jint)lpStruct->rect.right);
 	(*env)->SetIntField(env, lpObject, TOOLINFOFc.bottom, (jint)lpStruct->rect.bottom);
-	(*env)->SetIntField(env, lpObject, TOOLINFOFc.hinst, (jint)lpStruct->hinst);
-	(*env)->SetIntField(env, lpObject, TOOLINFOFc.lpszText, (jint)lpStruct->lpszText);
-	(*env)->SetIntField(env, lpObject, TOOLINFOFc.lParam, (jint)lpStruct->lParam);
-	(*env)->SetIntField(env, lpObject, TOOLINFOFc.lpReserved, (jint)lpStruct->lpReserved);
+	(*env)->SetIntLongField(env, lpObject, TOOLINFOFc.hinst, (jintLong)lpStruct->hinst);
+	(*env)->SetIntLongField(env, lpObject, TOOLINFOFc.lpszText, (jintLong)lpStruct->lpszText);
+	(*env)->SetIntLongField(env, lpObject, TOOLINFOFc.lParam, (jintLong)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, TOOLINFOFc.lpReserved, (jintLong)lpStruct->lpReserved);
 }
 #endif
 
@@ -7771,7 +7771,7 @@ void cacheTRACKMOUSEEVENTFields(JNIEnv *env, jobject lpObject)
 	TRACKMOUSEEVENTFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	TRACKMOUSEEVENTFc.cbSize = (*env)->GetFieldID(env, TRACKMOUSEEVENTFc.clazz, "cbSize", "I");
 	TRACKMOUSEEVENTFc.dwFlags = (*env)->GetFieldID(env, TRACKMOUSEEVENTFc.clazz, "dwFlags", "I");
-	TRACKMOUSEEVENTFc.hwndTrack = (*env)->GetFieldID(env, TRACKMOUSEEVENTFc.clazz, "hwndTrack", "I");
+	TRACKMOUSEEVENTFc.hwndTrack = (*env)->GetFieldID(env, TRACKMOUSEEVENTFc.clazz, "hwndTrack", I_J);
 	TRACKMOUSEEVENTFc.dwHoverTime = (*env)->GetFieldID(env, TRACKMOUSEEVENTFc.clazz, "dwHoverTime", "I");
 	TRACKMOUSEEVENTFc.cached = 1;
 }
@@ -7781,7 +7781,7 @@ TRACKMOUSEEVENT *getTRACKMOUSEEVENTFields(JNIEnv *env, jobject lpObject, TRACKMO
 	if (!TRACKMOUSEEVENTFc.cached) cacheTRACKMOUSEEVENTFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, TRACKMOUSEEVENTFc.cbSize);
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, TRACKMOUSEEVENTFc.dwFlags);
-	lpStruct->hwndTrack = (HWND)(*env)->GetIntField(env, lpObject, TRACKMOUSEEVENTFc.hwndTrack);
+	lpStruct->hwndTrack = (HWND)(*env)->GetIntLongField(env, lpObject, TRACKMOUSEEVENTFc.hwndTrack);
 	lpStruct->dwHoverTime = (*env)->GetIntField(env, lpObject, TRACKMOUSEEVENTFc.dwHoverTime);
 	return lpStruct;
 }
@@ -7791,7 +7791,7 @@ void setTRACKMOUSEEVENTFields(JNIEnv *env, jobject lpObject, TRACKMOUSEEVENT *lp
 	if (!TRACKMOUSEEVENTFc.cached) cacheTRACKMOUSEEVENTFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, TRACKMOUSEEVENTFc.cbSize, (jint)lpStruct->cbSize);
 	(*env)->SetIntField(env, lpObject, TRACKMOUSEEVENTFc.dwFlags, (jint)lpStruct->dwFlags);
-	(*env)->SetIntField(env, lpObject, TRACKMOUSEEVENTFc.hwndTrack, (jint)lpStruct->hwndTrack);
+	(*env)->SetIntLongField(env, lpObject, TRACKMOUSEEVENTFc.hwndTrack, (jintLong)lpStruct->hwndTrack);
 	(*env)->SetIntField(env, lpObject, TRACKMOUSEEVENTFc.dwHoverTime, (jint)lpStruct->dwHoverTime);
 }
 #endif
@@ -7858,7 +7858,7 @@ void cacheTVHITTESTINFOFields(JNIEnv *env, jobject lpObject)
 	TVHITTESTINFOFc.x = (*env)->GetFieldID(env, TVHITTESTINFOFc.clazz, "x", "I");
 	TVHITTESTINFOFc.y = (*env)->GetFieldID(env, TVHITTESTINFOFc.clazz, "y", "I");
 	TVHITTESTINFOFc.flags = (*env)->GetFieldID(env, TVHITTESTINFOFc.clazz, "flags", "I");
-	TVHITTESTINFOFc.hItem = (*env)->GetFieldID(env, TVHITTESTINFOFc.clazz, "hItem", "I");
+	TVHITTESTINFOFc.hItem = (*env)->GetFieldID(env, TVHITTESTINFOFc.clazz, "hItem", I_J);
 	TVHITTESTINFOFc.cached = 1;
 }
 
@@ -7868,7 +7868,7 @@ TVHITTESTINFO *getTVHITTESTINFOFields(JNIEnv *env, jobject lpObject, TVHITTESTIN
 	lpStruct->pt.x = (*env)->GetIntField(env, lpObject, TVHITTESTINFOFc.x);
 	lpStruct->pt.y = (*env)->GetIntField(env, lpObject, TVHITTESTINFOFc.y);
 	lpStruct->flags = (*env)->GetIntField(env, lpObject, TVHITTESTINFOFc.flags);
-	lpStruct->hItem = (HTREEITEM)(*env)->GetIntField(env, lpObject, TVHITTESTINFOFc.hItem);
+	lpStruct->hItem = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, TVHITTESTINFOFc.hItem);
 	return lpStruct;
 }
 
@@ -7878,7 +7878,7 @@ void setTVHITTESTINFOFields(JNIEnv *env, jobject lpObject, TVHITTESTINFO *lpStru
 	(*env)->SetIntField(env, lpObject, TVHITTESTINFOFc.x, (jint)lpStruct->pt.x);
 	(*env)->SetIntField(env, lpObject, TVHITTESTINFOFc.y, (jint)lpStruct->pt.y);
 	(*env)->SetIntField(env, lpObject, TVHITTESTINFOFc.flags, (jint)lpStruct->flags);
-	(*env)->SetIntField(env, lpObject, TVHITTESTINFOFc.hItem, (jint)lpStruct->hItem);
+	(*env)->SetIntLongField(env, lpObject, TVHITTESTINFOFc.hItem, (jintLong)lpStruct->hItem);
 }
 #endif
 
@@ -7895,18 +7895,18 @@ void cacheTVINSERTSTRUCTFields(JNIEnv *env, jobject lpObject)
 {
 	if (TVINSERTSTRUCTFc.cached) return;
 	TVINSERTSTRUCTFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	TVINSERTSTRUCTFc.hParent = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "hParent", "I");
-	TVINSERTSTRUCTFc.hInsertAfter = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "hInsertAfter", "I");
+	TVINSERTSTRUCTFc.hParent = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "hParent", I_J);
+	TVINSERTSTRUCTFc.hInsertAfter = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "hInsertAfter", I_J);
 	TVINSERTSTRUCTFc.mask = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "mask", "I");
-	TVINSERTSTRUCTFc.hItem = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "hItem", "I");
+	TVINSERTSTRUCTFc.hItem = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "hItem", I_J);
 	TVINSERTSTRUCTFc.state = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "state", "I");
 	TVINSERTSTRUCTFc.stateMask = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "stateMask", "I");
-	TVINSERTSTRUCTFc.pszText = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "pszText", "I");
+	TVINSERTSTRUCTFc.pszText = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "pszText", I_J);
 	TVINSERTSTRUCTFc.cchTextMax = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "cchTextMax", "I");
 	TVINSERTSTRUCTFc.iImage = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "iImage", "I");
 	TVINSERTSTRUCTFc.iSelectedImage = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "iSelectedImage", "I");
 	TVINSERTSTRUCTFc.cChildren = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "cChildren", "I");
-	TVINSERTSTRUCTFc.lParam = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "lParam", "I");
+	TVINSERTSTRUCTFc.lParam = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "lParam", I_J);
 	TVINSERTSTRUCTFc.iIntegral = (*env)->GetFieldID(env, TVINSERTSTRUCTFc.clazz, "iIntegral", "I");
 	TVINSERTSTRUCTFc.cached = 1;
 }
@@ -7914,18 +7914,18 @@ void cacheTVINSERTSTRUCTFields(JNIEnv *env, jobject lpObject)
 TVINSERTSTRUCT *getTVINSERTSTRUCTFields(JNIEnv *env, jobject lpObject, TVINSERTSTRUCT *lpStruct)
 {
 	if (!TVINSERTSTRUCTFc.cached) cacheTVINSERTSTRUCTFields(env, lpObject);
-	lpStruct->hParent = (HTREEITEM)(*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.hParent);
-	lpStruct->hInsertAfter = (HTREEITEM)(*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.hInsertAfter);
+	lpStruct->hParent = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, TVINSERTSTRUCTFc.hParent);
+	lpStruct->hInsertAfter = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, TVINSERTSTRUCTFc.hInsertAfter);
 	lpStruct->item.mask = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.mask);
-	lpStruct->item.hItem = (HTREEITEM)(*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.hItem);
+	lpStruct->item.hItem = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, TVINSERTSTRUCTFc.hItem);
 	lpStruct->item.state = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.state);
 	lpStruct->item.stateMask = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.stateMask);
-	lpStruct->item.pszText = (LPTSTR)(*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.pszText);
+	lpStruct->item.pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, TVINSERTSTRUCTFc.pszText);
 	lpStruct->item.cchTextMax = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.cchTextMax);
 	lpStruct->item.iImage = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.iImage);
 	lpStruct->item.iSelectedImage = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.iSelectedImage);
 	lpStruct->item.cChildren = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.cChildren);
-	lpStruct->item.lParam = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.lParam);
+	lpStruct->item.lParam = (*env)->GetIntLongField(env, lpObject, TVINSERTSTRUCTFc.lParam);
 #ifndef _WIN32_WCE
 	lpStruct->itemex.iIntegral = (*env)->GetIntField(env, lpObject, TVINSERTSTRUCTFc.iIntegral);
 #endif
@@ -7935,18 +7935,18 @@ TVINSERTSTRUCT *getTVINSERTSTRUCTFields(JNIEnv *env, jobject lpObject, TVINSERTS
 void setTVINSERTSTRUCTFields(JNIEnv *env, jobject lpObject, TVINSERTSTRUCT *lpStruct)
 {
 	if (!TVINSERTSTRUCTFc.cached) cacheTVINSERTSTRUCTFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.hParent, (jint)lpStruct->hParent);
-	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.hInsertAfter, (jint)lpStruct->hInsertAfter);
+	(*env)->SetIntLongField(env, lpObject, TVINSERTSTRUCTFc.hParent, (jintLong)lpStruct->hParent);
+	(*env)->SetIntLongField(env, lpObject, TVINSERTSTRUCTFc.hInsertAfter, (jintLong)lpStruct->hInsertAfter);
 	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.mask, (jint)lpStruct->item.mask);
-	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.hItem, (jint)lpStruct->item.hItem);
+	(*env)->SetIntLongField(env, lpObject, TVINSERTSTRUCTFc.hItem, (jintLong)lpStruct->item.hItem);
 	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.state, (jint)lpStruct->item.state);
 	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.stateMask, (jint)lpStruct->item.stateMask);
-	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.pszText, (jint)lpStruct->item.pszText);
+	(*env)->SetIntLongField(env, lpObject, TVINSERTSTRUCTFc.pszText, (jintLong)lpStruct->item.pszText);
 	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.cchTextMax, (jint)lpStruct->item.cchTextMax);
 	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.iImage, (jint)lpStruct->item.iImage);
 	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.iSelectedImage, (jint)lpStruct->item.iSelectedImage);
 	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.cChildren, (jint)lpStruct->item.cChildren);
-	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.lParam, (jint)lpStruct->item.lParam);
+	(*env)->SetIntLongField(env, lpObject, TVINSERTSTRUCTFc.lParam, (jintLong)lpStruct->item.lParam);
 #ifndef _WIN32_WCE
 	(*env)->SetIntField(env, lpObject, TVINSERTSTRUCTFc.iIntegral, (jint)lpStruct->itemex.iIntegral);
 #endif
@@ -7967,15 +7967,15 @@ void cacheTVITEMFields(JNIEnv *env, jobject lpObject)
 	if (TVITEMFc.cached) return;
 	TVITEMFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	TVITEMFc.mask = (*env)->GetFieldID(env, TVITEMFc.clazz, "mask", "I");
-	TVITEMFc.hItem = (*env)->GetFieldID(env, TVITEMFc.clazz, "hItem", "I");
+	TVITEMFc.hItem = (*env)->GetFieldID(env, TVITEMFc.clazz, "hItem", I_J);
 	TVITEMFc.state = (*env)->GetFieldID(env, TVITEMFc.clazz, "state", "I");
 	TVITEMFc.stateMask = (*env)->GetFieldID(env, TVITEMFc.clazz, "stateMask", "I");
-	TVITEMFc.pszText = (*env)->GetFieldID(env, TVITEMFc.clazz, "pszText", "I");
+	TVITEMFc.pszText = (*env)->GetFieldID(env, TVITEMFc.clazz, "pszText", I_J);
 	TVITEMFc.cchTextMax = (*env)->GetFieldID(env, TVITEMFc.clazz, "cchTextMax", "I");
 	TVITEMFc.iImage = (*env)->GetFieldID(env, TVITEMFc.clazz, "iImage", "I");
 	TVITEMFc.iSelectedImage = (*env)->GetFieldID(env, TVITEMFc.clazz, "iSelectedImage", "I");
 	TVITEMFc.cChildren = (*env)->GetFieldID(env, TVITEMFc.clazz, "cChildren", "I");
-	TVITEMFc.lParam = (*env)->GetFieldID(env, TVITEMFc.clazz, "lParam", "I");
+	TVITEMFc.lParam = (*env)->GetFieldID(env, TVITEMFc.clazz, "lParam", I_J);
 	TVITEMFc.cached = 1;
 }
 
@@ -7983,15 +7983,15 @@ TVITEM *getTVITEMFields(JNIEnv *env, jobject lpObject, TVITEM *lpStruct)
 {
 	if (!TVITEMFc.cached) cacheTVITEMFields(env, lpObject);
 	lpStruct->mask = (*env)->GetIntField(env, lpObject, TVITEMFc.mask);
-	lpStruct->hItem = (HTREEITEM)(*env)->GetIntField(env, lpObject, TVITEMFc.hItem);
+	lpStruct->hItem = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, TVITEMFc.hItem);
 	lpStruct->state = (*env)->GetIntField(env, lpObject, TVITEMFc.state);
 	lpStruct->stateMask = (*env)->GetIntField(env, lpObject, TVITEMFc.stateMask);
-	lpStruct->pszText = (LPTSTR)(*env)->GetIntField(env, lpObject, TVITEMFc.pszText);
+	lpStruct->pszText = (LPTSTR)(*env)->GetIntLongField(env, lpObject, TVITEMFc.pszText);
 	lpStruct->cchTextMax = (*env)->GetIntField(env, lpObject, TVITEMFc.cchTextMax);
 	lpStruct->iImage = (*env)->GetIntField(env, lpObject, TVITEMFc.iImage);
 	lpStruct->iSelectedImage = (*env)->GetIntField(env, lpObject, TVITEMFc.iSelectedImage);
 	lpStruct->cChildren = (*env)->GetIntField(env, lpObject, TVITEMFc.cChildren);
-	lpStruct->lParam = (*env)->GetIntField(env, lpObject, TVITEMFc.lParam);
+	lpStruct->lParam = (*env)->GetIntLongField(env, lpObject, TVITEMFc.lParam);
 	return lpStruct;
 }
 
@@ -7999,15 +7999,15 @@ void setTVITEMFields(JNIEnv *env, jobject lpObject, TVITEM *lpStruct)
 {
 	if (!TVITEMFc.cached) cacheTVITEMFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, TVITEMFc.mask, (jint)lpStruct->mask);
-	(*env)->SetIntField(env, lpObject, TVITEMFc.hItem, (jint)lpStruct->hItem);
+	(*env)->SetIntLongField(env, lpObject, TVITEMFc.hItem, (jintLong)lpStruct->hItem);
 	(*env)->SetIntField(env, lpObject, TVITEMFc.state, (jint)lpStruct->state);
 	(*env)->SetIntField(env, lpObject, TVITEMFc.stateMask, (jint)lpStruct->stateMask);
-	(*env)->SetIntField(env, lpObject, TVITEMFc.pszText, (jint)lpStruct->pszText);
+	(*env)->SetIntLongField(env, lpObject, TVITEMFc.pszText, (jintLong)lpStruct->pszText);
 	(*env)->SetIntField(env, lpObject, TVITEMFc.cchTextMax, (jint)lpStruct->cchTextMax);
 	(*env)->SetIntField(env, lpObject, TVITEMFc.iImage, (jint)lpStruct->iImage);
 	(*env)->SetIntField(env, lpObject, TVITEMFc.iSelectedImage, (jint)lpStruct->iSelectedImage);
 	(*env)->SetIntField(env, lpObject, TVITEMFc.cChildren, (jint)lpStruct->cChildren);
-	(*env)->SetIntField(env, lpObject, TVITEMFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, TVITEMFc.lParam, (jintLong)lpStruct->lParam);
 }
 #endif
 
@@ -8058,27 +8058,27 @@ void cacheTVSORTCBFields(JNIEnv *env, jobject lpObject)
 {
 	if (TVSORTCBFc.cached) return;
 	TVSORTCBFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	TVSORTCBFc.hParent = (*env)->GetFieldID(env, TVSORTCBFc.clazz, "hParent", "I");
-	TVSORTCBFc.lpfnCompare = (*env)->GetFieldID(env, TVSORTCBFc.clazz, "lpfnCompare", "I");
-	TVSORTCBFc.lParam = (*env)->GetFieldID(env, TVSORTCBFc.clazz, "lParam", "I");
+	TVSORTCBFc.hParent = (*env)->GetFieldID(env, TVSORTCBFc.clazz, "hParent", I_J);
+	TVSORTCBFc.lpfnCompare = (*env)->GetFieldID(env, TVSORTCBFc.clazz, "lpfnCompare", I_J);
+	TVSORTCBFc.lParam = (*env)->GetFieldID(env, TVSORTCBFc.clazz, "lParam", I_J);
 	TVSORTCBFc.cached = 1;
 }
 
 TVSORTCB *getTVSORTCBFields(JNIEnv *env, jobject lpObject, TVSORTCB *lpStruct)
 {
 	if (!TVSORTCBFc.cached) cacheTVSORTCBFields(env, lpObject);
-	lpStruct->hParent = (HTREEITEM)(*env)->GetIntField(env, lpObject, TVSORTCBFc.hParent);
-	lpStruct->lpfnCompare = (PFNTVCOMPARE)(*env)->GetIntField(env, lpObject, TVSORTCBFc.lpfnCompare);
-	lpStruct->lParam = (LPARAM)(*env)->GetIntField(env, lpObject, TVSORTCBFc.lParam);
+	lpStruct->hParent = (HTREEITEM)(*env)->GetIntLongField(env, lpObject, TVSORTCBFc.hParent);
+	lpStruct->lpfnCompare = (PFNTVCOMPARE)(*env)->GetIntLongField(env, lpObject, TVSORTCBFc.lpfnCompare);
+	lpStruct->lParam = (LPARAM)(*env)->GetIntLongField(env, lpObject, TVSORTCBFc.lParam);
 	return lpStruct;
 }
 
 void setTVSORTCBFields(JNIEnv *env, jobject lpObject, TVSORTCB *lpStruct)
 {
 	if (!TVSORTCBFc.cached) cacheTVSORTCBFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, TVSORTCBFc.hParent, (jint)lpStruct->hParent);
-	(*env)->SetIntField(env, lpObject, TVSORTCBFc.lpfnCompare, (jint)lpStruct->lpfnCompare);
-	(*env)->SetIntField(env, lpObject, TVSORTCBFc.lParam, (jint)lpStruct->lParam);
+	(*env)->SetIntLongField(env, lpObject, TVSORTCBFc.hParent, (jintLong)lpStruct->hParent);
+	(*env)->SetIntLongField(env, lpObject, TVSORTCBFc.lpfnCompare, (jintLong)lpStruct->lpfnCompare);
+	(*env)->SetIntLongField(env, lpObject, TVSORTCBFc.lParam, (jintLong)lpStruct->lParam);
 }
 #endif
 
@@ -8190,8 +8190,8 @@ void cacheWINDOWPOSFields(JNIEnv *env, jobject lpObject)
 {
 	if (WINDOWPOSFc.cached) return;
 	WINDOWPOSFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	WINDOWPOSFc.hwnd = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "hwnd", "I");
-	WINDOWPOSFc.hwndInsertAfter = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "hwndInsertAfter", "I");
+	WINDOWPOSFc.hwnd = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "hwnd", I_J);
+	WINDOWPOSFc.hwndInsertAfter = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "hwndInsertAfter", I_J);
 	WINDOWPOSFc.x = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "x", "I");
 	WINDOWPOSFc.y = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "y", "I");
 	WINDOWPOSFc.cx = (*env)->GetFieldID(env, WINDOWPOSFc.clazz, "cx", "I");
@@ -8203,8 +8203,8 @@ void cacheWINDOWPOSFields(JNIEnv *env, jobject lpObject)
 WINDOWPOS *getWINDOWPOSFields(JNIEnv *env, jobject lpObject, WINDOWPOS *lpStruct)
 {
 	if (!WINDOWPOSFc.cached) cacheWINDOWPOSFields(env, lpObject);
-	lpStruct->hwnd = (HWND)(*env)->GetIntField(env, lpObject, WINDOWPOSFc.hwnd);
-	lpStruct->hwndInsertAfter = (HWND)(*env)->GetIntField(env, lpObject, WINDOWPOSFc.hwndInsertAfter);
+	lpStruct->hwnd = (HWND)(*env)->GetIntLongField(env, lpObject, WINDOWPOSFc.hwnd);
+	lpStruct->hwndInsertAfter = (HWND)(*env)->GetIntLongField(env, lpObject, WINDOWPOSFc.hwndInsertAfter);
 	lpStruct->x = (*env)->GetIntField(env, lpObject, WINDOWPOSFc.x);
 	lpStruct->y = (*env)->GetIntField(env, lpObject, WINDOWPOSFc.y);
 	lpStruct->cx = (*env)->GetIntField(env, lpObject, WINDOWPOSFc.cx);
@@ -8216,8 +8216,8 @@ WINDOWPOS *getWINDOWPOSFields(JNIEnv *env, jobject lpObject, WINDOWPOS *lpStruct
 void setWINDOWPOSFields(JNIEnv *env, jobject lpObject, WINDOWPOS *lpStruct)
 {
 	if (!WINDOWPOSFc.cached) cacheWINDOWPOSFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, WINDOWPOSFc.hwnd, (jint)lpStruct->hwnd);
-	(*env)->SetIntField(env, lpObject, WINDOWPOSFc.hwndInsertAfter, (jint)lpStruct->hwndInsertAfter);
+	(*env)->SetIntLongField(env, lpObject, WINDOWPOSFc.hwnd, (jintLong)lpStruct->hwnd);
+	(*env)->SetIntLongField(env, lpObject, WINDOWPOSFc.hwndInsertAfter, (jintLong)lpStruct->hwndInsertAfter);
 	(*env)->SetIntField(env, lpObject, WINDOWPOSFc.x, (jint)lpStruct->x);
 	(*env)->SetIntField(env, lpObject, WINDOWPOSFc.y, (jint)lpStruct->y);
 	(*env)->SetIntField(env, lpObject, WINDOWPOSFc.cx, (jint)lpStruct->cx);
@@ -8240,15 +8240,15 @@ void cacheWNDCLASSFields(JNIEnv *env, jobject lpObject)
 	if (WNDCLASSFc.cached) return;
 	WNDCLASSFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	WNDCLASSFc.style = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "style", "I");
-	WNDCLASSFc.lpfnWndProc = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "lpfnWndProc", "I");
+	WNDCLASSFc.lpfnWndProc = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "lpfnWndProc", I_J);
 	WNDCLASSFc.cbClsExtra = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "cbClsExtra", "I");
 	WNDCLASSFc.cbWndExtra = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "cbWndExtra", "I");
-	WNDCLASSFc.hInstance = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hInstance", "I");
-	WNDCLASSFc.hIcon = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hIcon", "I");
-	WNDCLASSFc.hCursor = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hCursor", "I");
-	WNDCLASSFc.hbrBackground = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hbrBackground", "I");
-	WNDCLASSFc.lpszMenuName = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "lpszMenuName", "I");
-	WNDCLASSFc.lpszClassName = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "lpszClassName", "I");
+	WNDCLASSFc.hInstance = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hInstance", I_J);
+	WNDCLASSFc.hIcon = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hIcon", I_J);
+	WNDCLASSFc.hCursor = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hCursor", I_J);
+	WNDCLASSFc.hbrBackground = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "hbrBackground", I_J);
+	WNDCLASSFc.lpszMenuName = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "lpszMenuName", I_J);
+	WNDCLASSFc.lpszClassName = (*env)->GetFieldID(env, WNDCLASSFc.clazz, "lpszClassName", I_J);
 	WNDCLASSFc.cached = 1;
 }
 
@@ -8256,15 +8256,15 @@ WNDCLASS *getWNDCLASSFields(JNIEnv *env, jobject lpObject, WNDCLASS *lpStruct)
 {
 	if (!WNDCLASSFc.cached) cacheWNDCLASSFields(env, lpObject);
 	lpStruct->style = (*env)->GetIntField(env, lpObject, WNDCLASSFc.style);
-	lpStruct->lpfnWndProc = (WNDPROC)(*env)->GetIntField(env, lpObject, WNDCLASSFc.lpfnWndProc);
+	lpStruct->lpfnWndProc = (WNDPROC)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.lpfnWndProc);
 	lpStruct->cbClsExtra = (*env)->GetIntField(env, lpObject, WNDCLASSFc.cbClsExtra);
 	lpStruct->cbWndExtra = (*env)->GetIntField(env, lpObject, WNDCLASSFc.cbWndExtra);
-	lpStruct->hInstance = (HINSTANCE)(*env)->GetIntField(env, lpObject, WNDCLASSFc.hInstance);
-	lpStruct->hIcon = (HICON)(*env)->GetIntField(env, lpObject, WNDCLASSFc.hIcon);
-	lpStruct->hCursor = (HCURSOR)(*env)->GetIntField(env, lpObject, WNDCLASSFc.hCursor);
-	lpStruct->hbrBackground = (HBRUSH)(*env)->GetIntField(env, lpObject, WNDCLASSFc.hbrBackground);
-	lpStruct->lpszMenuName = (LPCTSTR)(*env)->GetIntField(env, lpObject, WNDCLASSFc.lpszMenuName);
-	lpStruct->lpszClassName = (LPCTSTR)(*env)->GetIntField(env, lpObject, WNDCLASSFc.lpszClassName);
+	lpStruct->hInstance = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.hInstance);
+	lpStruct->hIcon = (HICON)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.hIcon);
+	lpStruct->hCursor = (HCURSOR)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.hCursor);
+	lpStruct->hbrBackground = (HBRUSH)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.hbrBackground);
+	lpStruct->lpszMenuName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.lpszMenuName);
+	lpStruct->lpszClassName = (LPCTSTR)(*env)->GetIntLongField(env, lpObject, WNDCLASSFc.lpszClassName);
 	return lpStruct;
 }
 
@@ -8272,15 +8272,15 @@ void setWNDCLASSFields(JNIEnv *env, jobject lpObject, WNDCLASS *lpStruct)
 {
 	if (!WNDCLASSFc.cached) cacheWNDCLASSFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, WNDCLASSFc.style, (jint)lpStruct->style);
-	(*env)->SetIntField(env, lpObject, WNDCLASSFc.lpfnWndProc, (jint)lpStruct->lpfnWndProc);
+	(*env)->SetIntLongField(env, lpObject, WNDCLASSFc.lpfnWndProc, (jintLong)lpStruct->lpfnWndProc);
 	(*env)->SetIntField(env, lpObject, WNDCLASSFc.cbClsExtra, (jint)lpStruct->cbClsExtra);
 	(*env)->SetIntField(env, lpObject, WNDCLASSFc.cbWndExtra, (jint)lpStruct->cbWndExtra);
-	(*env)->SetIntField(env, lpObject, WNDCLASSFc.hInstance, (jint)lpStruct->hInstance);
-	(*env)->SetIntField(env, lpObject, WNDCLASSFc.hIcon, (jint)lpStruct->hIcon);
-	(*env)->SetIntField(env, lpObject, WNDCLASSFc.hCursor, (jint)lpStruct->hCursor);
-	(*env)->SetIntField(env, lpObject, WNDCLASSFc.hbrBackground, (jint)lpStruct->hbrBackground);
-	(*env)->SetIntField(env, lpObject, WNDCLASSFc.lpszMenuName, (jint)lpStruct->lpszMenuName);
-	(*env)->SetIntField(env, lpObject, WNDCLASSFc.lpszClassName, (jint)lpStruct->lpszClassName);
+	(*env)->SetIntLongField(env, lpObject, WNDCLASSFc.hInstance, (jintLong)lpStruct->hInstance);
+	(*env)->SetIntLongField(env, lpObject, WNDCLASSFc.hIcon, (jintLong)lpStruct->hIcon);
+	(*env)->SetIntLongField(env, lpObject, WNDCLASSFc.hCursor, (jintLong)lpStruct->hCursor);
+	(*env)->SetIntLongField(env, lpObject, WNDCLASSFc.hbrBackground, (jintLong)lpStruct->hbrBackground);
+	(*env)->SetIntLongField(env, lpObject, WNDCLASSFc.lpszMenuName, (jintLong)lpStruct->lpszMenuName);
+	(*env)->SetIntLongField(env, lpObject, WNDCLASSFc.lpszClassName, (jintLong)lpStruct->lpszClassName);
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/win32_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/win32_structs.c
index 752e770b11..6dded9d5b5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/win32_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/library/win32_structs.c
@@ -102,8 +102,8 @@ void cachePROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject)
 {
 	if (PROCESS_INFORMATIONFc.cached) return;
 	PROCESS_INFORMATIONFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	PROCESS_INFORMATIONFc.hProcess = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "hProcess", "I");
-	PROCESS_INFORMATIONFc.hThread = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "hThread", "I");
+	PROCESS_INFORMATIONFc.hProcess = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "hProcess", I_J);
+	PROCESS_INFORMATIONFc.hThread = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "hThread", I_J);
 	PROCESS_INFORMATIONFc.dwProcessId = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "dwProcessId", "I");
 	PROCESS_INFORMATIONFc.dwThreadId = (*env)->GetFieldID(env, PROCESS_INFORMATIONFc.clazz, "dwThreadId", "I");
 	PROCESS_INFORMATIONFc.cached = 1;
@@ -112,8 +112,8 @@ void cachePROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject)
 PROCESS_INFORMATION *getPROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject, PROCESS_INFORMATION *lpStruct)
 {
 	if (!PROCESS_INFORMATIONFc.cached) cachePROCESS_INFORMATIONFields(env, lpObject);
-	lpStruct->hProcess = (HANDLE)(*env)->GetIntField(env, lpObject, PROCESS_INFORMATIONFc.hProcess);
-	lpStruct->hThread = (HANDLE)(*env)->GetIntField(env, lpObject, PROCESS_INFORMATIONFc.hThread);
+	lpStruct->hProcess = (HANDLE)(*env)->GetIntLongField(env, lpObject, PROCESS_INFORMATIONFc.hProcess);
+	lpStruct->hThread = (HANDLE)(*env)->GetIntLongField(env, lpObject, PROCESS_INFORMATIONFc.hThread);
 	lpStruct->dwProcessId = (*env)->GetIntField(env, lpObject, PROCESS_INFORMATIONFc.dwProcessId);
 	lpStruct->dwThreadId = (*env)->GetIntField(env, lpObject, PROCESS_INFORMATIONFc.dwThreadId);
 	return lpStruct;
@@ -122,8 +122,8 @@ PROCESS_INFORMATION *getPROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject,
 void setPROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject, PROCESS_INFORMATION *lpStruct)
 {
 	if (!PROCESS_INFORMATIONFc.cached) cachePROCESS_INFORMATIONFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, PROCESS_INFORMATIONFc.hProcess, (jint)lpStruct->hProcess);
-	(*env)->SetIntField(env, lpObject, PROCESS_INFORMATIONFc.hThread, (jint)lpStruct->hThread);
+	(*env)->SetIntLongField(env, lpObject, PROCESS_INFORMATIONFc.hProcess, (jintLong)lpStruct->hProcess);
+	(*env)->SetIntLongField(env, lpObject, PROCESS_INFORMATIONFc.hThread, (jintLong)lpStruct->hThread);
 	(*env)->SetIntField(env, lpObject, PROCESS_INFORMATIONFc.dwProcessId, (jint)lpStruct->dwProcessId);
 	(*env)->SetIntField(env, lpObject, PROCESS_INFORMATIONFc.dwThreadId, (jint)lpStruct->dwThreadId);
 }
@@ -144,19 +144,19 @@ void cacheSHELLEXECUTEINFOWFields(JNIEnv *env, jobject lpObject)
 	SHELLEXECUTEINFOWFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	SHELLEXECUTEINFOWFc.cbSize = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "cbSize", "I");
 	SHELLEXECUTEINFOWFc.fMask = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "fMask", "I");
-	SHELLEXECUTEINFOWFc.hwnd = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "hwnd", "I");
-	SHELLEXECUTEINFOWFc.lpVerb = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "lpVerb", "I");
+	SHELLEXECUTEINFOWFc.hwnd = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "hwnd", I_J);
+	SHELLEXECUTEINFOWFc.lpVerb = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "lpVerb", I_J);
 	SHELLEXECUTEINFOWFc.lpFile = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "lpFile", "I");
-	SHELLEXECUTEINFOWFc.lpParameters = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "lpParameters", "I");
-	SHELLEXECUTEINFOWFc.lpDirectory = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "lpDirectory", "I");
+	SHELLEXECUTEINFOWFc.lpParameters = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "lpParameters", I_J);
+	SHELLEXECUTEINFOWFc.lpDirectory = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "lpDirectory", I_J);
 	SHELLEXECUTEINFOWFc.nShow = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "nShow", "I");
-	SHELLEXECUTEINFOWFc.hInstApp = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "hInstApp", "I");
-	SHELLEXECUTEINFOWFc.lpIDList = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "lpIDList", "I");
-	SHELLEXECUTEINFOWFc.lpClass = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "lpClass", "I");
-	SHELLEXECUTEINFOWFc.hkeyClass = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "hkeyClass", "I");
+	SHELLEXECUTEINFOWFc.hInstApp = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "hInstApp", I_J);
+	SHELLEXECUTEINFOWFc.lpIDList = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "lpIDList", I_J);
+	SHELLEXECUTEINFOWFc.lpClass = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "lpClass", I_J);
+	SHELLEXECUTEINFOWFc.hkeyClass = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "hkeyClass", I_J);
 	SHELLEXECUTEINFOWFc.dwHotKey = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "dwHotKey", "I");
-	SHELLEXECUTEINFOWFc.hIcon = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "hIcon", "I");
-	SHELLEXECUTEINFOWFc.hProcess = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "hProcess", "I");
+	SHELLEXECUTEINFOWFc.hIcon = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "hIcon", I_J);
+	SHELLEXECUTEINFOWFc.hProcess = (*env)->GetFieldID(env, SHELLEXECUTEINFOWFc.clazz, "hProcess", I_J);
 	SHELLEXECUTEINFOWFc.cached = 1;
 }
 
@@ -165,19 +165,19 @@ SHELLEXECUTEINFOW *getSHELLEXECUTEINFOWFields(JNIEnv *env, jobject lpObject, SHE
 	if (!SHELLEXECUTEINFOWFc.cached) cacheSHELLEXECUTEINFOWFields(env, lpObject);
 	lpStruct->cbSize = (*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.cbSize);
 	lpStruct->fMask = (*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.fMask);
-	lpStruct->hwnd = (HWND)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.hwnd);
-	lpStruct->lpVerb = (LPWSTR)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.lpVerb);
+	lpStruct->hwnd = (HWND)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.hwnd);
+	lpStruct->lpVerb = (LPWSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.lpVerb);
 	lpStruct->lpFile = (LPWSTR)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.lpFile);
-	lpStruct->lpParameters = (LPWSTR)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.lpParameters);
-	lpStruct->lpDirectory = (LPWSTR)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.lpDirectory);
+	lpStruct->lpParameters = (LPWSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.lpParameters);
+	lpStruct->lpDirectory = (LPWSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.lpDirectory);
 	lpStruct->nShow = (*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.nShow);
-	lpStruct->hInstApp = (HINSTANCE)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.hInstApp);
-	lpStruct->lpIDList = (LPVOID)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.lpIDList);
-	lpStruct->lpClass = (LPWSTR)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.lpClass);
-	lpStruct->hkeyClass = (HKEY)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.hkeyClass);
+	lpStruct->hInstApp = (HINSTANCE)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.hInstApp);
+	lpStruct->lpIDList = (LPVOID)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.lpIDList);
+	lpStruct->lpClass = (LPWSTR)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.lpClass);
+	lpStruct->hkeyClass = (HKEY)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.hkeyClass);
 	lpStruct->dwHotKey = (*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.dwHotKey);
-	lpStruct->hIcon = (HANDLE)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.hIcon);
-	lpStruct->hProcess = (HANDLE)(*env)->GetIntField(env, lpObject, SHELLEXECUTEINFOWFc.hProcess);
+	lpStruct->hIcon = (HANDLE)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.hIcon);
+	lpStruct->hProcess = (HANDLE)(*env)->GetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.hProcess);
 	return lpStruct;
 }
 
@@ -186,19 +186,19 @@ void setSHELLEXECUTEINFOWFields(JNIEnv *env, jobject lpObject, SHELLEXECUTEINFOW
 	if (!SHELLEXECUTEINFOWFc.cached) cacheSHELLEXECUTEINFOWFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.cbSize, (jint)lpStruct->cbSize);
 	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.fMask, (jint)lpStruct->fMask);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.hwnd, (jint)lpStruct->hwnd);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.lpVerb, (jint)lpStruct->lpVerb);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.hwnd, (jintLong)lpStruct->hwnd);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.lpVerb, (jintLong)lpStruct->lpVerb);
 	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.lpFile, (jint)lpStruct->lpFile);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.lpParameters, (jint)lpStruct->lpParameters);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.lpDirectory, (jint)lpStruct->lpDirectory);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.lpParameters, (jintLong)lpStruct->lpParameters);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.lpDirectory, (jintLong)lpStruct->lpDirectory);
 	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.nShow, (jint)lpStruct->nShow);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.hInstApp, (jint)lpStruct->hInstApp);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.lpIDList, (jint)lpStruct->lpIDList);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.lpClass, (jint)lpStruct->lpClass);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.hkeyClass, (jint)lpStruct->hkeyClass);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.hInstApp, (jintLong)lpStruct->hInstApp);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.lpIDList, (jintLong)lpStruct->lpIDList);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.lpClass, (jintLong)lpStruct->lpClass);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.hkeyClass, (jintLong)lpStruct->hkeyClass);
 	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.dwHotKey, (jint)lpStruct->dwHotKey);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.hIcon, (jint)lpStruct->hIcon);
-	(*env)->SetIntField(env, lpObject, SHELLEXECUTEINFOWFc.hProcess, (jint)lpStruct->hProcess);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.hIcon, (jintLong)lpStruct->hIcon);
+	(*env)->SetIntLongField(env, lpObject, SHELLEXECUTEINFOWFc.hProcess, (jintLong)lpStruct->hProcess);
 }
 #endif
 
@@ -216,9 +216,9 @@ void cacheSTARTUPINFOWFields(JNIEnv *env, jobject lpObject)
 	if (STARTUPINFOWFc.cached) return;
 	STARTUPINFOWFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	STARTUPINFOWFc.cb = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "cb", "I");
-	STARTUPINFOWFc.lpReserved = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "lpReserved", "I");
-	STARTUPINFOWFc.lpDesktop = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "lpDesktop", "I");
-	STARTUPINFOWFc.lpTitle = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "lpTitle", "I");
+	STARTUPINFOWFc.lpReserved = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "lpReserved", I_J);
+	STARTUPINFOWFc.lpDesktop = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "lpDesktop", I_J);
+	STARTUPINFOWFc.lpTitle = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "lpTitle", I_J);
 	STARTUPINFOWFc.dwX = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "dwX", "I");
 	STARTUPINFOWFc.dwY = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "dwY", "I");
 	STARTUPINFOWFc.dwXSize = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "dwXSize", "I");
@@ -229,10 +229,10 @@ void cacheSTARTUPINFOWFields(JNIEnv *env, jobject lpObject)
 	STARTUPINFOWFc.dwFlags = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "dwFlags", "I");
 	STARTUPINFOWFc.wShowWindow = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "wShowWindow", "S");
 	STARTUPINFOWFc.cbReserved2 = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "cbReserved2", "S");
-	STARTUPINFOWFc.lpReserved2 = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "lpReserved2", "I");
-	STARTUPINFOWFc.hStdInput = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "hStdInput", "I");
-	STARTUPINFOWFc.hStdOutput = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "hStdOutput", "I");
-	STARTUPINFOWFc.hStdError = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "hStdError", "I");
+	STARTUPINFOWFc.lpReserved2 = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "lpReserved2", I_J);
+	STARTUPINFOWFc.hStdInput = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "hStdInput", I_J);
+	STARTUPINFOWFc.hStdOutput = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "hStdOutput", I_J);
+	STARTUPINFOWFc.hStdError = (*env)->GetFieldID(env, STARTUPINFOWFc.clazz, "hStdError", I_J);
 	STARTUPINFOWFc.cached = 1;
 }
 
@@ -240,9 +240,9 @@ STARTUPINFOW *getSTARTUPINFOWFields(JNIEnv *env, jobject lpObject, STARTUPINFOW
 {
 	if (!STARTUPINFOWFc.cached) cacheSTARTUPINFOWFields(env, lpObject);
 	lpStruct->cb = (*env)->GetIntField(env, lpObject, STARTUPINFOWFc.cb);
-	lpStruct->lpReserved = (LPWSTR)(*env)->GetIntField(env, lpObject, STARTUPINFOWFc.lpReserved);
-	lpStruct->lpDesktop = (LPWSTR)(*env)->GetIntField(env, lpObject, STARTUPINFOWFc.lpDesktop);
-	lpStruct->lpTitle = (LPWSTR)(*env)->GetIntField(env, lpObject, STARTUPINFOWFc.lpTitle);
+	lpStruct->lpReserved = (LPWSTR)(*env)->GetIntLongField(env, lpObject, STARTUPINFOWFc.lpReserved);
+	lpStruct->lpDesktop = (LPWSTR)(*env)->GetIntLongField(env, lpObject, STARTUPINFOWFc.lpDesktop);
+	lpStruct->lpTitle = (LPWSTR)(*env)->GetIntLongField(env, lpObject, STARTUPINFOWFc.lpTitle);
 	lpStruct->dwX = (*env)->GetIntField(env, lpObject, STARTUPINFOWFc.dwX);
 	lpStruct->dwY = (*env)->GetIntField(env, lpObject, STARTUPINFOWFc.dwY);
 	lpStruct->dwXSize = (*env)->GetIntField(env, lpObject, STARTUPINFOWFc.dwXSize);
@@ -253,10 +253,10 @@ STARTUPINFOW *getSTARTUPINFOWFields(JNIEnv *env, jobject lpObject, STARTUPINFOW
 	lpStruct->dwFlags = (*env)->GetIntField(env, lpObject, STARTUPINFOWFc.dwFlags);
 	lpStruct->wShowWindow = (*env)->GetShortField(env, lpObject, STARTUPINFOWFc.wShowWindow);
 	lpStruct->cbReserved2 = (*env)->GetShortField(env, lpObject, STARTUPINFOWFc.cbReserved2);
-	lpStruct->lpReserved2 = (LPBYTE)(*env)->GetIntField(env, lpObject, STARTUPINFOWFc.lpReserved2);
-	lpStruct->hStdInput = (HANDLE)(*env)->GetIntField(env, lpObject, STARTUPINFOWFc.hStdInput);
-	lpStruct->hStdOutput = (HANDLE)(*env)->GetIntField(env, lpObject, STARTUPINFOWFc.hStdOutput);
-	lpStruct->hStdError = (HANDLE)(*env)->GetIntField(env, lpObject, STARTUPINFOWFc.hStdError);
+	lpStruct->lpReserved2 = (LPBYTE)(*env)->GetIntLongField(env, lpObject, STARTUPINFOWFc.lpReserved2);
+	lpStruct->hStdInput = (HANDLE)(*env)->GetIntLongField(env, lpObject, STARTUPINFOWFc.hStdInput);
+	lpStruct->hStdOutput = (HANDLE)(*env)->GetIntLongField(env, lpObject, STARTUPINFOWFc.hStdOutput);
+	lpStruct->hStdError = (HANDLE)(*env)->GetIntLongField(env, lpObject, STARTUPINFOWFc.hStdError);
 	return lpStruct;
 }
 
@@ -264,9 +264,9 @@ void setSTARTUPINFOWFields(JNIEnv *env, jobject lpObject, STARTUPINFOW *lpStruct
 {
 	if (!STARTUPINFOWFc.cached) cacheSTARTUPINFOWFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, STARTUPINFOWFc.cb, (jint)lpStruct->cb);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOWFc.lpReserved, (jint)lpStruct->lpReserved);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOWFc.lpDesktop, (jint)lpStruct->lpDesktop);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOWFc.lpTitle, (jint)lpStruct->lpTitle);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOWFc.lpReserved, (jintLong)lpStruct->lpReserved);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOWFc.lpDesktop, (jintLong)lpStruct->lpDesktop);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOWFc.lpTitle, (jintLong)lpStruct->lpTitle);
 	(*env)->SetIntField(env, lpObject, STARTUPINFOWFc.dwX, (jint)lpStruct->dwX);
 	(*env)->SetIntField(env, lpObject, STARTUPINFOWFc.dwY, (jint)lpStruct->dwY);
 	(*env)->SetIntField(env, lpObject, STARTUPINFOWFc.dwXSize, (jint)lpStruct->dwXSize);
@@ -277,10 +277,10 @@ void setSTARTUPINFOWFields(JNIEnv *env, jobject lpObject, STARTUPINFOW *lpStruct
 	(*env)->SetIntField(env, lpObject, STARTUPINFOWFc.dwFlags, (jint)lpStruct->dwFlags);
 	(*env)->SetShortField(env, lpObject, STARTUPINFOWFc.wShowWindow, (jshort)lpStruct->wShowWindow);
 	(*env)->SetShortField(env, lpObject, STARTUPINFOWFc.cbReserved2, (jshort)lpStruct->cbReserved2);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOWFc.lpReserved2, (jint)lpStruct->lpReserved2);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOWFc.hStdInput, (jint)lpStruct->hStdInput);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOWFc.hStdOutput, (jint)lpStruct->hStdOutput);
-	(*env)->SetIntField(env, lpObject, STARTUPINFOWFc.hStdError, (jint)lpStruct->hStdError);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOWFc.lpReserved2, (jintLong)lpStruct->lpReserved2);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOWFc.hStdInput, (jintLong)lpStruct->hStdInput);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOWFc.hStdOutput, (jintLong)lpStruct->hStdOutput);
+	(*env)->SetIntLongField(env, lpObject, STARTUPINFOWFc.hStdError, (jintLong)lpStruct->hStdError);
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde.c b/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde.c
index 50f86b41ca..0840e83c41 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde.c
@@ -29,7 +29,7 @@ JNIEXPORT jint JNICALL CDE_NATIVE(DtActionArg_1sizeof)
 
 #ifndef NO__1DtActionInvoke
 JNIEXPORT jlong JNICALL CDE_NATIVE(_1DtActionInvoke)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2, jint arg3, jbyteArray arg4, jbyteArray arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jint arg3, jbyteArray arg4, jbyteArray arg5, jbyteArray arg6, jint arg7, jintLong arg8, jintLong arg9)
 {
 	jbyte *lparg1=NULL;
 	DtActionArg _arg2, *lparg2=NULL;
@@ -57,7 +57,7 @@ fail:
 
 #ifndef NO__1DtAppInitialize
 JNIEXPORT jboolean JNICALL CDE_NATIVE(_1DtAppInitialize)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbyteArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jbyteArray arg4)
 {
 	jbyte *lparg3=NULL;
 	jbyte *lparg4=NULL;
@@ -101,30 +101,30 @@ fail:
 #endif
 
 #ifndef NO__1DtDtsDataTypeNames
-JNIEXPORT jint JNICALL CDE_NATIVE(_1DtDtsDataTypeNames)
+JNIEXPORT jintLong JNICALL CDE_NATIVE(_1DtDtsDataTypeNames)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	CDE_NATIVE_ENTER(env, that, _1DtDtsDataTypeNames_FUNC);
-	rc = (jint)DtDtsDataTypeNames();
+	rc = (jintLong)DtDtsDataTypeNames();
 	CDE_NATIVE_EXIT(env, that, _1DtDtsDataTypeNames_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1DtDtsDataTypeToAttributeValue
-JNIEXPORT jint JNICALL CDE_NATIVE(_1DtDtsDataTypeToAttributeValue)
+JNIEXPORT jintLong JNICALL CDE_NATIVE(_1DtDtsDataTypeToAttributeValue)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jbyteArray arg2)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	CDE_NATIVE_ENTER(env, that, _1DtDtsDataTypeToAttributeValue_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)DtDtsDataTypeToAttributeValue((char *)lparg0, (char *)lparg1, (char *)lparg2);
+	rc = (jintLong)DtDtsDataTypeToAttributeValue((char *)lparg0, (char *)lparg1, (char *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
@@ -135,14 +135,14 @@ fail:
 #endif
 
 #ifndef NO__1DtDtsFileToDataType
-JNIEXPORT jint JNICALL CDE_NATIVE(_1DtDtsFileToDataType)
+JNIEXPORT jintLong JNICALL CDE_NATIVE(_1DtDtsFileToDataType)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	CDE_NATIVE_ENTER(env, that, _1DtDtsFileToDataType_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)DtDtsFileToDataType((char *)lparg0);
+	rc = (jintLong)DtDtsFileToDataType((char *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	CDE_NATIVE_EXIT(env, that, _1DtDtsFileToDataType_FUNC);
@@ -152,7 +152,7 @@ fail:
 
 #ifndef NO__1DtDtsFreeAttributeValue
 JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeAttributeValue)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	CDE_NATIVE_ENTER(env, that, _1DtDtsFreeAttributeValue_FUNC);
 	DtDtsFreeAttributeValue((char *)arg0);
@@ -162,7 +162,7 @@ JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeAttributeValue)
 
 #ifndef NO__1DtDtsFreeDataType
 JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeDataType)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	CDE_NATIVE_ENTER(env, that, _1DtDtsFreeDataType_FUNC);
 	DtDtsFreeDataType((char *)arg0);
@@ -172,7 +172,7 @@ JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeDataType)
 
 #ifndef NO__1DtDtsFreeDataTypeNames
 JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeDataTypeNames)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	CDE_NATIVE_ENTER(env, that, _1DtDtsFreeDataTypeNames_FUNC);
 	DtDtsFreeDataTypeNames((char **)arg0);
@@ -181,20 +181,20 @@ JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeDataTypeNames)
 #endif
 
 #ifndef NO__1XtAppCreateShell
-JNIEXPORT jint JNICALL CDE_NATIVE(_1XtAppCreateShell)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jint arg2, jint arg3, jintArray arg4, jint arg5)
+JNIEXPORT jintLong JNICALL CDE_NATIVE(_1XtAppCreateShell)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jintLong arg2, jintLong arg3, jintLongArray arg4, jint arg5)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg1=NULL;
-	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
 	CDE_NATIVE_ENTER(env, that, _1XtAppCreateShell_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)XtAppCreateShell((String)lparg0, (String)lparg1, (WidgetClass)arg2, (Display *)arg3, (ArgList)lparg4, arg5);
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jintLong)XtAppCreateShell((String)lparg0, (String)lparg1, (WidgetClass)arg2, (Display *)arg3, (ArgList)lparg4, arg5);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	CDE_NATIVE_EXIT(env, that, _1XtAppCreateShell_FUNC);
@@ -203,12 +203,12 @@ fail:
 #endif
 
 #ifndef NO__1XtCreateApplicationContext
-JNIEXPORT jint JNICALL CDE_NATIVE(_1XtCreateApplicationContext)
+JNIEXPORT jintLong JNICALL CDE_NATIVE(_1XtCreateApplicationContext)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	CDE_NATIVE_ENTER(env, that, _1XtCreateApplicationContext_FUNC);
-	rc = (jint)XtCreateApplicationContext();
+	rc = (jintLong)XtCreateApplicationContext();
 	CDE_NATIVE_EXIT(env, that, _1XtCreateApplicationContext_FUNC);
 	return rc;
 }
@@ -216,18 +216,18 @@ JNIEXPORT jint JNICALL CDE_NATIVE(_1XtCreateApplicationContext)
 
 #ifndef NO__1XtDisplayInitialize
 JNIEXPORT void JNICALL CDE_NATIVE(_1XtDisplayInitialize)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6, jint arg7)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintLong arg4, jint arg5, jintLongArray arg6, jint arg7)
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
-	jint *lparg6=NULL;
+	jintLong *lparg6=NULL;
 	CDE_NATIVE_ENTER(env, that, _1XtDisplayInitialize_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	XtDisplayInitialize((XtAppContext)arg0, (Display *)arg1, (String)lparg2, (String)lparg3, (XrmOptionDescRec *)arg4, (Cardinal)arg5, (int *)lparg6, (String *)arg7);
 fail:
-	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
+	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	CDE_NATIVE_EXIT(env, that, _1XtDisplayInitialize_FUNC);
@@ -236,7 +236,7 @@ fail:
 
 #ifndef NO__1XtRealizeWidget
 JNIEXPORT void JNICALL CDE_NATIVE(_1XtRealizeWidget)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	CDE_NATIVE_ENTER(env, that, _1XtRealizeWidget_FUNC);
 	XtRealizeWidget((Widget)arg0);
@@ -246,7 +246,7 @@ JNIEXPORT void JNICALL CDE_NATIVE(_1XtRealizeWidget)
 
 #ifndef NO__1XtResizeWidget
 JNIEXPORT void JNICALL CDE_NATIVE(_1XtResizeWidget)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
 {
 	CDE_NATIVE_ENTER(env, that, _1XtResizeWidget_FUNC);
 	XtResizeWidget((Widget)arg0, arg1, arg2, arg3);
@@ -256,7 +256,7 @@ JNIEXPORT void JNICALL CDE_NATIVE(_1XtResizeWidget)
 
 #ifndef NO__1XtSetMappedWhenManaged
 JNIEXPORT void JNICALL CDE_NATIVE(_1XtSetMappedWhenManaged)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	CDE_NATIVE_ENTER(env, that, _1XtSetMappedWhenManaged_FUNC);
 	XtSetMappedWhenManaged((Widget)arg0, arg1);
@@ -275,12 +275,12 @@ JNIEXPORT void JNICALL CDE_NATIVE(_1XtToolkitInitialize)
 #endif
 
 #ifndef NO__1topLevelShellWidgetClass
-JNIEXPORT jint JNICALL CDE_NATIVE(_1topLevelShellWidgetClass)
+JNIEXPORT jintLong JNICALL CDE_NATIVE(_1topLevelShellWidgetClass)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	CDE_NATIVE_ENTER(env, that, _1topLevelShellWidgetClass_FUNC);
-	rc = (jint)topLevelShellWidgetClass;
+	rc = (jintLong)topLevelShellWidgetClass;
 	CDE_NATIVE_EXIT(env, that, _1topLevelShellWidgetClass_FUNC);
 	return rc;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde_structs.c b/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde_structs.c
index 86fc1b3bec..07aadbc30e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/cde/library/cde_structs.c
@@ -26,7 +26,7 @@ void cacheDtActionArgFields(JNIEnv *env, jobject lpObject)
 	if (DtActionArgFc.cached) return;
 	DtActionArgFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	DtActionArgFc.argClass = (*env)->GetFieldID(env, DtActionArgFc.clazz, "argClass", "I");
-	DtActionArgFc.name = (*env)->GetFieldID(env, DtActionArgFc.clazz, "name", "I");
+	DtActionArgFc.name = (*env)->GetFieldID(env, DtActionArgFc.clazz, "name", I_J);
 	DtActionArgFc.cached = 1;
 }
 
@@ -34,7 +34,7 @@ DtActionArg *getDtActionArgFields(JNIEnv *env, jobject lpObject, DtActionArg *lp
 {
 	if (!DtActionArgFc.cached) cacheDtActionArgFields(env, lpObject);
 	lpStruct->argClass = (*env)->GetIntField(env, lpObject, DtActionArgFc.argClass);
-	lpStruct->u.file.name = (char *)(*env)->GetIntField(env, lpObject, DtActionArgFc.name);
+	lpStruct->u.file.name = (char *)(*env)->GetIntLongField(env, lpObject, DtActionArgFc.name);
 	return lpStruct;
 }
 
@@ -42,7 +42,7 @@ void setDtActionArgFields(JNIEnv *env, jobject lpObject, DtActionArg *lpStruct)
 {
 	if (!DtActionArgFc.cached) cacheDtActionArgFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, DtActionArgFc.argClass, (jint)lpStruct->argClass);
-	(*env)->SetIntField(env, lpObject, DtActionArgFc.name, (jint)lpStruct->u.file.name);
+	(*env)->SetIntLongField(env, lpObject, DtActionArgFc.name, (jintLong)lpStruct->u.file.name);
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c
index 5fc52dff75..c74ea719a6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c
@@ -33,7 +33,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(GnomeVFSMimeApplication_1sizeof)
 
 #ifndef NO__1g_1free
 JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	GNOME_NATIVE_ENTER(env, that, _1g_1free_FUNC);
 	g_free((gpointer)arg0);
@@ -42,12 +42,12 @@ JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1free)
 #endif
 
 #ifndef NO__1g_1list_1append
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1g_1list_1append)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1g_1list_1append)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1g_1list_1append_FUNC);
-	rc = (jint)g_list_append((GList *)arg0, (gpointer)arg1);
+	rc = (jintLong)g_list_append((GList *)arg0, (gpointer)arg1);
 	GNOME_NATIVE_EXIT(env, that, _1g_1list_1append_FUNC);
 	return rc;
 }
@@ -55,7 +55,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1g_1list_1append)
 
 #ifndef NO__1g_1list_1free
 JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1list_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	GNOME_NATIVE_ENTER(env, that, _1g_1list_1free_FUNC);
 	g_list_free((GList *)arg0);
@@ -64,12 +64,12 @@ JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1list_1free)
 #endif
 
 #ifndef NO__1g_1list_1next
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1g_1list_1next)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1g_1list_1next)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1g_1list_1next_FUNC);
-	rc = (jint)g_list_next(arg0);
+	rc = (jintLong)g_list_next(arg0);
 	GNOME_NATIVE_EXIT(env, that, _1g_1list_1next_FUNC);
 	return rc;
 }
@@ -77,7 +77,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1g_1list_1next)
 
 #ifndef NO__1g_1object_1unref
 JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1object_1unref)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	GNOME_NATIVE_ENTER(env, that, _1g_1object_1unref_FUNC);
 	g_object_unref((gpointer)arg0);
@@ -86,20 +86,20 @@ JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1object_1unref)
 #endif
 
 #ifndef NO__1gnome_1icon_1lookup
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1icon_1lookup)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4, jbyteArray arg5, jint arg6, jintArray arg7)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1icon_1lookup)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintLong arg4, jbyteArray arg5, jint arg6, jintArray arg7)
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
 	jbyte *lparg5=NULL;
 	jint *lparg7=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1icon_1lookup_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
-	rc = (jint)gnome_icon_lookup((GnomeIconTheme *)arg0, (GnomeThumbnailFactory *)arg1, (const char *)lparg2, (const char *)lparg3, (GnomeVFSFileInfo *)arg4, (const char *)lparg5, (GnomeIconLookupFlags)arg6, (GnomeIconLookupResultFlags *)lparg7);
+	rc = (jintLong)gnome_icon_lookup((GnomeIconTheme *)arg0, (GnomeThumbnailFactory *)arg1, (const char *)lparg2, (const char *)lparg3, (GnomeVFSFileInfo *)arg4, (const char *)lparg5, (GnomeIconLookupFlags)arg6, (GnomeIconLookupResultFlags *)lparg7);
 fail:
 	if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
 	if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0);
@@ -111,43 +111,43 @@ fail:
 #endif
 
 #ifndef NO__1gnome_1icon_1theme_1lookup_1icon
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1icon_1theme_1lookup_1icon)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1icon_1theme_1lookup_1icon)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintArray arg4)
 {
-	jint *lparg3=NULL;
+	jintLong *lparg3=NULL;
 	jint *lparg4=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1icon_1theme_1lookup_1icon_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jint)gnome_icon_theme_lookup_icon((GnomeIconTheme *)arg0, (const char *)arg1, arg2, (const GnomeIconData **)lparg3, lparg4);
+	rc = (jintLong)gnome_icon_theme_lookup_icon((GnomeIconTheme *)arg0, (const char *)arg1, arg2, (const GnomeIconData **)lparg3, lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	GNOME_NATIVE_EXIT(env, that, _1gnome_1icon_1theme_1lookup_1icon_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gnome_1icon_1theme_1new
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1icon_1theme_1new)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1icon_1theme_1new)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1icon_1theme_1new_FUNC);
-	rc = (jint)gnome_icon_theme_new();
+	rc = (jintLong)gnome_icon_theme_new();
 	GNOME_NATIVE_EXIT(env, that, _1gnome_1icon_1theme_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gnome_1vfs_1get_1registered_1mime_1types
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1get_1registered_1mime_1types)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1get_1registered_1mime_1types)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1get_1registered_1mime_1types_FUNC);
-	rc = (jint)gnome_vfs_get_registered_mime_types();
+	rc = (jintLong)gnome_vfs_get_registered_mime_types();
 	GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1get_1registered_1mime_1types_FUNC);
 	return rc;
 }
@@ -166,14 +166,14 @@ JNIEXPORT jboolean JNICALL GNOME_NATIVE(_1gnome_1vfs_1init)
 #endif
 
 #ifndef NO__1gnome_1vfs_1make_1uri_1from_1input
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1make_1uri_1from_1input_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gnome_vfs_make_uri_from_input((const char *)lparg0);
+	rc = (jintLong)gnome_vfs_make_uri_from_input((const char *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1make_1uri_1from_1input_FUNC);
@@ -182,29 +182,20 @@ fail:
 #endif
 
 #ifndef NO__1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)gnome_vfs_make_uri_from_input_with_dirs((const char *)lparg0, arg1);
+	rc = (jintLong)gnome_vfs_make_uri_from_input_with_dirs((const char *)lparg0, arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(const char *, jint);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gnome_vfs_make_uri_from_input_with_dirs_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gnome_vfs_make_uri_from_input_with_dirs");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((const char *)lparg0, arg1);
+		LOAD_FUNCTION(fp, gnome_vfs_make_uri_from_input_with_dirs)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *, jint))fp)((const char *)lparg0, arg1);
 		}
 	}
 fail:
@@ -216,7 +207,7 @@ fail:
 
 #ifndef NO__1gnome_1vfs_1mime_1application_1free
 JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1application_1free_FUNC);
 	gnome_vfs_mime_application_free((GnomeVFSMimeApplication *)arg0);
@@ -226,7 +217,7 @@ JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1free)
 
 #ifndef NO__1gnome_1vfs_1mime_1application_1launch
 JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1launch)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1application_1launch_FUNC);
@@ -234,18 +225,9 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1launch)
 	rc = (jint)gnome_vfs_mime_application_launch((GnomeVFSMimeApplication *)arg0, (GList *)arg1);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(GnomeVFSMimeApplication *, GList *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gnome_vfs_mime_application_launch_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gnome_vfs_mime_application_launch");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((GnomeVFSMimeApplication *)arg0, (GList *)arg1);
+		LOAD_FUNCTION(fp, gnome_vfs_mime_application_launch)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GnomeVFSMimeApplication *, GList *))fp)((GnomeVFSMimeApplication *)arg0, (GList *)arg1);
 		}
 	}
 	GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1application_1launch_FUNC);
@@ -255,7 +237,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1launch)
 
 #ifndef NO__1gnome_1vfs_1mime_1extensions_1list_1free
 JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1extensions_1list_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1extensions_1list_1free_FUNC);
 	gnome_vfs_mime_extensions_list_free((GList *)arg0);
@@ -264,14 +246,14 @@ JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1extensions_1list_1free)
 #endif
 
 #ifndef NO__1gnome_1vfs_1mime_1get_1default_1application
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1default_1application)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1default_1application)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1get_1default_1application_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gnome_vfs_mime_get_default_application((const char *)lparg0);
+	rc = (jintLong)gnome_vfs_mime_get_default_application((const char *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1get_1default_1application_FUNC);
@@ -280,12 +262,12 @@ fail:
 #endif
 
 #ifndef NO__1gnome_1vfs_1mime_1get_1extensions_1list
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1extensions_1list)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1extensions_1list)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1get_1extensions_1list_FUNC);
-	rc = (jint)gnome_vfs_mime_get_extensions_list((const char *)arg0);
+	rc = (jintLong)gnome_vfs_mime_get_extensions_list((const char *)arg0);
 	GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1get_1extensions_1list_FUNC);
 	return rc;
 }
@@ -293,7 +275,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1extensions_1list)
 
 #ifndef NO__1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free
 JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free_FUNC);
 	gnome_vfs_mime_registered_mime_type_list_free((GList *)arg0);
@@ -302,14 +284,14 @@ JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1registered_1mime_1type_1
 #endif
 
 #ifndef NO__1gnome_1vfs_1mime_1type_1from_1name
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1type_1from_1name)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1type_1from_1name)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1type_1from_1name_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)gnome_vfs_mime_type_from_name((const char *)lparg0);
+	rc = (jintLong)gnome_vfs_mime_type_from_name((const char *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1type_1from_1name_FUNC);
@@ -319,7 +301,7 @@ fail:
 
 #ifndef NO__1gnome_1vfs_1url_1show
 JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1url_1show)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1url_1show_FUNC);
@@ -327,18 +309,9 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1url_1show)
 	rc = (jint)gnome_vfs_url_show((const char *)arg0);
 */
 	{
-		static int initialized = 0;
-		static void *handle = NULL;
-		typedef jint (*FPTR)(const char *);
-		static FPTR fptr;
-		rc = 0;
-		if (!initialized) {
-			if (!handle) handle = dlopen(gnome_vfs_url_show_LIB, RTLD_LAZY);
-			if (handle) fptr = (FPTR)dlsym(handle, "gnome_vfs_url_show");
-			initialized = 1;
-		}
-		if (fptr) {
-			rc = (jint)(*fptr)((const char *)arg0);
+		LOAD_FUNCTION(fp, gnome_vfs_url_show)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(const char *))fp)((const char *)arg0);
 		}
 	}
 	GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1url_1show_FUNC);
@@ -348,7 +321,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1url_1show)
 
 #ifndef NO_memmove
 JNIEXPORT void JNICALL GNOME_NATIVE(memmove)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
 {
 	GnomeVFSMimeApplication _arg0, *lparg0=NULL;
 	GNOME_NATIVE_ENTER(env, that, memmove_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_structs.c b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_structs.c
index b6fcc46ed0..c6426d43e8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_structs.c
@@ -29,12 +29,12 @@ void cacheGnomeVFSMimeApplicationFields(JNIEnv *env, jobject lpObject)
 {
 	if (GnomeVFSMimeApplicationFc.cached) return;
 	GnomeVFSMimeApplicationFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GnomeVFSMimeApplicationFc.id = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "id", "I");
-	GnomeVFSMimeApplicationFc.name = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "name", "I");
-	GnomeVFSMimeApplicationFc.command = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "command", "I");
+	GnomeVFSMimeApplicationFc.id = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "id", I_J);
+	GnomeVFSMimeApplicationFc.name = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "name", I_J);
+	GnomeVFSMimeApplicationFc.command = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "command", I_J);
 	GnomeVFSMimeApplicationFc.can_open_multiple_files = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "can_open_multiple_files", "Z");
 	GnomeVFSMimeApplicationFc.expects_uris = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "expects_uris", "I");
-	GnomeVFSMimeApplicationFc.supported_uri_schemes = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "supported_uri_schemes", "I");
+	GnomeVFSMimeApplicationFc.supported_uri_schemes = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "supported_uri_schemes", I_J);
 	GnomeVFSMimeApplicationFc.requires_terminal = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "requires_terminal", "Z");
 	GnomeVFSMimeApplicationFc.cached = 1;
 }
@@ -42,12 +42,12 @@ void cacheGnomeVFSMimeApplicationFields(JNIEnv *env, jobject lpObject)
 GnomeVFSMimeApplication *getGnomeVFSMimeApplicationFields(JNIEnv *env, jobject lpObject, GnomeVFSMimeApplication *lpStruct)
 {
 	if (!GnomeVFSMimeApplicationFc.cached) cacheGnomeVFSMimeApplicationFields(env, lpObject);
-	lpStruct->id = (char *)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.id);
-	lpStruct->name = (char *)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.name);
-	lpStruct->command = (char *)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.command);
+	lpStruct->id = (char *)(*env)->GetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.id);
+	lpStruct->name = (char *)(*env)->GetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.name);
+	lpStruct->command = (char *)(*env)->GetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.command);
 	lpStruct->can_open_multiple_files = (gboolean)(*env)->GetBooleanField(env, lpObject, GnomeVFSMimeApplicationFc.can_open_multiple_files);
 	lpStruct->expects_uris = (GnomeVFSMimeApplicationArgumentType)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.expects_uris);
-	lpStruct->supported_uri_schemes = (GList *)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.supported_uri_schemes);
+	lpStruct->supported_uri_schemes = (GList *)(*env)->GetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.supported_uri_schemes);
 	lpStruct->requires_terminal = (gboolean)(*env)->GetBooleanField(env, lpObject, GnomeVFSMimeApplicationFc.requires_terminal);
 	return lpStruct;
 }
@@ -55,12 +55,12 @@ GnomeVFSMimeApplication *getGnomeVFSMimeApplicationFields(JNIEnv *env, jobject l
 void setGnomeVFSMimeApplicationFields(JNIEnv *env, jobject lpObject, GnomeVFSMimeApplication *lpStruct)
 {
 	if (!GnomeVFSMimeApplicationFc.cached) cacheGnomeVFSMimeApplicationFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.id, (jint)lpStruct->id);
-	(*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.name, (jint)lpStruct->name);
-	(*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.command, (jint)lpStruct->command);
+	(*env)->SetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.id, (jintLong)lpStruct->id);
+	(*env)->SetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.name, (jintLong)lpStruct->name);
+	(*env)->SetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.command, (jintLong)lpStruct->command);
 	(*env)->SetBooleanField(env, lpObject, GnomeVFSMimeApplicationFc.can_open_multiple_files, (jboolean)lpStruct->can_open_multiple_files);
 	(*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.expects_uris, (jint)lpStruct->expects_uris);
-	(*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.supported_uri_schemes, (jint)lpStruct->supported_uri_schemes);
+	(*env)->SetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.supported_uri_schemes, (jintLong)lpStruct->supported_uri_schemes);
 	(*env)->SetBooleanField(env, lpObject, GnomeVFSMimeApplicationFc.requires_terminal, (jboolean)lpStruct->requires_terminal);
 }
 #endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c
index 21d96c409b..232072ca5e 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c
@@ -30,7 +30,7 @@ static int initialized = 0;
 static int counter = 0;
 #endif
 
-SWT_PTR callback(int index, ...);
+jintLong callback(int index, ...);
 
 #ifdef USE_ASSEMBLER
 
@@ -60,40 +60,40 @@ static unsigned char *callbackCode = NULL;
 #define FN_0(index) RETURN_TYPE FN(index, 0)() { return RETURN_CAST callback(index); }
 
 /* Function template with 1 argument */
-#define FN_1(index) RETURN_TYPE FN(index, 1)(SWT_PTR p1) { return RETURN_CAST callback(index, p1); }
+#define FN_1(index) RETURN_TYPE FN(index, 1)(jintLong p1) { return RETURN_CAST callback(index, p1); }
 
 /* Function template with 2 arguments */
-#define FN_2(index) RETURN_TYPE FN(index, 2)(SWT_PTR p1, SWT_PTR p2) { return RETURN_CAST callback(index, p1, p2); }
+#define FN_2(index) RETURN_TYPE FN(index, 2)(jintLong p1, jintLong p2) { return RETURN_CAST callback(index, p1, p2); }
 
 /* Function template with 3 arguments */
-#define FN_3(index) RETURN_TYPE FN(index, 3)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3) { return RETURN_CAST callback(index, p1, p2, p3); }
+#define FN_3(index) RETURN_TYPE FN(index, 3)(jintLong p1, jintLong p2, jintLong p3) { return RETURN_CAST callback(index, p1, p2, p3); }
 
 /* Function template with 4 arguments */
-#define FN_4(index) RETURN_TYPE FN(index, 4)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4) { return RETURN_CAST callback(index, p1, p2, p3, p4); }
+#define FN_4(index) RETURN_TYPE FN(index, 4)(jintLong p1, jintLong p2, jintLong p3, jintLong p4) { return RETURN_CAST callback(index, p1, p2, p3, p4); }
 
 /* Function template with 5 arguments */
-#define FN_5(index) RETURN_TYPE FN(index, 5)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5); }
+#define FN_5(index) RETURN_TYPE FN(index, 5)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5); }
 
 /* Function template with 6 arguments */
-#define FN_6(index) RETURN_TYPE FN(index, 6)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6); }
+#define FN_6(index) RETURN_TYPE FN(index, 6)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6); }
 
 /* Function template with 7 arguments */
-#define FN_7(index) RETURN_TYPE FN(index, 7)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6, SWT_PTR p7) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7); }
+#define FN_7(index) RETURN_TYPE FN(index, 7)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7); }
 
 /* Function template with 8 arguments */
-#define FN_8(index) RETURN_TYPE FN(index, 8)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6, SWT_PTR p7, SWT_PTR p8) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8); }
+#define FN_8(index) RETURN_TYPE FN(index, 8)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8); }
 
 /* Function template with 9 arguments */
-#define FN_9(index) RETURN_TYPE FN(index, 9)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6, SWT_PTR p7, SWT_PTR p8, SWT_PTR p9) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9); }
+#define FN_9(index) RETURN_TYPE FN(index, 9)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8, jintLong p9) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9); }
 
 /* Function template with 10 arguments */
-#define FN_10(index) RETURN_TYPE FN(index, 10) (SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6, SWT_PTR p7, SWT_PTR p8, SWT_PTR p9, SWT_PTR p10) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); }
+#define FN_10(index) RETURN_TYPE FN(index, 10) (jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8, jintLong p9, jintLong p10) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); }
 
 /* Function template with 11 arguments */
-#define FN_11(index) RETURN_TYPE FN(index, 11) (SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6, SWT_PTR p7, SWT_PTR p8, SWT_PTR p9, SWT_PTR p10, SWT_PTR p11) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); }
+#define FN_11(index) RETURN_TYPE FN(index, 11) (jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8, jintLong p9, jintLong p10, jintLong p11) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); }
 
 /* Function template with 12 arguments */
-#define FN_12(index) RETURN_TYPE FN(index, 12) (SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6, SWT_PTR p7, SWT_PTR p8, SWT_PTR p9, SWT_PTR p10, SWT_PTR p11, SWT_PTR p12) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); }
+#define FN_12(index) RETURN_TYPE FN(index, 12) (jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8, jintLong p9, jintLong p10, jintLong p11, jintLong p12) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); }
 
 /**
  * Define all functions with the specified number of arguments.
@@ -280,159 +280,159 @@ FN_BLOCK(12)
  */
 #if MAX_CALLBACKS == 16
 #define FN_A_BLOCK(args) { \
-	(SWT_PTR)FN(0, args), \
-	(SWT_PTR)FN(1, args), \
-	(SWT_PTR)FN(2, args), \
-	(SWT_PTR)FN(3, args), \
-	(SWT_PTR)FN(4, args), \
-	(SWT_PTR)FN(5, args), \
-	(SWT_PTR)FN(6, args), \
-	(SWT_PTR)FN(7, args), \
-	(SWT_PTR)FN(8, args), \
-	(SWT_PTR)FN(9, args), \
-	(SWT_PTR)FN(10, args), \
-	(SWT_PTR)FN(11, args), \
-	(SWT_PTR)FN(12, args), \
-	(SWT_PTR)FN(13, args), \
-	(SWT_PTR)FN(14, args), \
-	(SWT_PTR)FN(15, args), \
+	(jintLong)FN(0, args), \
+	(jintLong)FN(1, args), \
+	(jintLong)FN(2, args), \
+	(jintLong)FN(3, args), \
+	(jintLong)FN(4, args), \
+	(jintLong)FN(5, args), \
+	(jintLong)FN(6, args), \
+	(jintLong)FN(7, args), \
+	(jintLong)FN(8, args), \
+	(jintLong)FN(9, args), \
+	(jintLong)FN(10, args), \
+	(jintLong)FN(11, args), \
+	(jintLong)FN(12, args), \
+	(jintLong)FN(13, args), \
+	(jintLong)FN(14, args), \
+	(jintLong)FN(15, args), \
 },
 #elif MAX_CALLBACKS == 128
 #define FN_A_BLOCK(args) { \
-	(SWT_PTR)FN(0, args), \
-	(SWT_PTR)FN(1, args), \
-	(SWT_PTR)FN(2, args), \
-	(SWT_PTR)FN(3, args), \
-	(SWT_PTR)FN(4, args), \
-	(SWT_PTR)FN(5, args), \
-	(SWT_PTR)FN(6, args), \
-	(SWT_PTR)FN(7, args), \
-	(SWT_PTR)FN(8, args), \
-	(SWT_PTR)FN(9, args), \
-	(SWT_PTR)FN(10, args), \
-	(SWT_PTR)FN(11, args), \
-	(SWT_PTR)FN(12, args), \
-	(SWT_PTR)FN(13, args), \
-	(SWT_PTR)FN(14, args), \
-	(SWT_PTR)FN(15, args), \
-	(SWT_PTR)FN(16, args), \
-	(SWT_PTR)FN(17, args), \
-	(SWT_PTR)FN(18, args), \
-	(SWT_PTR)FN(19, args), \
-	(SWT_PTR)FN(20, args), \
-	(SWT_PTR)FN(21, args), \
-	(SWT_PTR)FN(22, args), \
-	(SWT_PTR)FN(23, args), \
-	(SWT_PTR)FN(24, args), \
-	(SWT_PTR)FN(25, args), \
-	(SWT_PTR)FN(26, args), \
-	(SWT_PTR)FN(27, args), \
-	(SWT_PTR)FN(28, args), \
-	(SWT_PTR)FN(29, args), \
-	(SWT_PTR)FN(30, args), \
-	(SWT_PTR)FN(31, args), \
-	(SWT_PTR)FN(32, args), \
-	(SWT_PTR)FN(33, args), \
-	(SWT_PTR)FN(34, args), \
-	(SWT_PTR)FN(35, args), \
-	(SWT_PTR)FN(36, args), \
-	(SWT_PTR)FN(37, args), \
-	(SWT_PTR)FN(38, args), \
-	(SWT_PTR)FN(39, args), \
-	(SWT_PTR)FN(40, args), \
-	(SWT_PTR)FN(41, args), \
-	(SWT_PTR)FN(42, args), \
-	(SWT_PTR)FN(43, args), \
-	(SWT_PTR)FN(44, args), \
-	(SWT_PTR)FN(45, args), \
-	(SWT_PTR)FN(46, args), \
-	(SWT_PTR)FN(47, args), \
-	(SWT_PTR)FN(48, args), \
-	(SWT_PTR)FN(49, args), \
-	(SWT_PTR)FN(50, args), \
-	(SWT_PTR)FN(51, args), \
-	(SWT_PTR)FN(52, args), \
-	(SWT_PTR)FN(53, args), \
-	(SWT_PTR)FN(54, args), \
-	(SWT_PTR)FN(55, args), \
-	(SWT_PTR)FN(56, args), \
-	(SWT_PTR)FN(57, args), \
-	(SWT_PTR)FN(58, args), \
-	(SWT_PTR)FN(59, args), \
-	(SWT_PTR)FN(60, args), \
-	(SWT_PTR)FN(61, args), \
-	(SWT_PTR)FN(62, args), \
-	(SWT_PTR)FN(63, args), \
-	(SWT_PTR)FN(64, args), \
-	(SWT_PTR)FN(65, args), \
-	(SWT_PTR)FN(66, args), \
-	(SWT_PTR)FN(67, args), \
-	(SWT_PTR)FN(68, args), \
-	(SWT_PTR)FN(69, args), \
-	(SWT_PTR)FN(70, args), \
-	(SWT_PTR)FN(71, args), \
-	(SWT_PTR)FN(72, args), \
-	(SWT_PTR)FN(73, args), \
-	(SWT_PTR)FN(74, args), \
-	(SWT_PTR)FN(75, args), \
-	(SWT_PTR)FN(76, args), \
-	(SWT_PTR)FN(77, args), \
-	(SWT_PTR)FN(78, args), \
-	(SWT_PTR)FN(79, args), \
-	(SWT_PTR)FN(80, args), \
-	(SWT_PTR)FN(81, args), \
-	(SWT_PTR)FN(82, args), \
-	(SWT_PTR)FN(83, args), \
-	(SWT_PTR)FN(84, args), \
-	(SWT_PTR)FN(85, args), \
-	(SWT_PTR)FN(86, args), \
-	(SWT_PTR)FN(87, args), \
-	(SWT_PTR)FN(88, args), \
-	(SWT_PTR)FN(89, args), \
-	(SWT_PTR)FN(90, args), \
-	(SWT_PTR)FN(91, args), \
-	(SWT_PTR)FN(92, args), \
-	(SWT_PTR)FN(93, args), \
-	(SWT_PTR)FN(94, args), \
-	(SWT_PTR)FN(95, args), \
-	(SWT_PTR)FN(96, args), \
-	(SWT_PTR)FN(97, args), \
-	(SWT_PTR)FN(98, args), \
-	(SWT_PTR)FN(99, args), \
-	(SWT_PTR)FN(100, args), \
-	(SWT_PTR)FN(101, args), \
-	(SWT_PTR)FN(102, args), \
-	(SWT_PTR)FN(103, args), \
-	(SWT_PTR)FN(104, args), \
-	(SWT_PTR)FN(105, args), \
-	(SWT_PTR)FN(106, args), \
-	(SWT_PTR)FN(107, args), \
-	(SWT_PTR)FN(108, args), \
-	(SWT_PTR)FN(109, args), \
-	(SWT_PTR)FN(110, args), \
-	(SWT_PTR)FN(111, args), \
-	(SWT_PTR)FN(112, args), \
-	(SWT_PTR)FN(113, args), \
-	(SWT_PTR)FN(114, args), \
-	(SWT_PTR)FN(115, args), \
-	(SWT_PTR)FN(116, args), \
-	(SWT_PTR)FN(117, args), \
-	(SWT_PTR)FN(118, args), \
-	(SWT_PTR)FN(119, args), \
-	(SWT_PTR)FN(120, args), \
-	(SWT_PTR)FN(121, args), \
-	(SWT_PTR)FN(122, args), \
-	(SWT_PTR)FN(123, args), \
-	(SWT_PTR)FN(124, args), \
-	(SWT_PTR)FN(125, args), \
-	(SWT_PTR)FN(126, args), \
-	(SWT_PTR)FN(127, args), \
+	(jintLong)FN(0, args), \
+	(jintLong)FN(1, args), \
+	(jintLong)FN(2, args), \
+	(jintLong)FN(3, args), \
+	(jintLong)FN(4, args), \
+	(jintLong)FN(5, args), \
+	(jintLong)FN(6, args), \
+	(jintLong)FN(7, args), \
+	(jintLong)FN(8, args), \
+	(jintLong)FN(9, args), \
+	(jintLong)FN(10, args), \
+	(jintLong)FN(11, args), \
+	(jintLong)FN(12, args), \
+	(jintLong)FN(13, args), \
+	(jintLong)FN(14, args), \
+	(jintLong)FN(15, args), \
+	(jintLong)FN(16, args), \
+	(jintLong)FN(17, args), \
+	(jintLong)FN(18, args), \
+	(jintLong)FN(19, args), \
+	(jintLong)FN(20, args), \
+	(jintLong)FN(21, args), \
+	(jintLong)FN(22, args), \
+	(jintLong)FN(23, args), \
+	(jintLong)FN(24, args), \
+	(jintLong)FN(25, args), \
+	(jintLong)FN(26, args), \
+	(jintLong)FN(27, args), \
+	(jintLong)FN(28, args), \
+	(jintLong)FN(29, args), \
+	(jintLong)FN(30, args), \
+	(jintLong)FN(31, args), \
+	(jintLong)FN(32, args), \
+	(jintLong)FN(33, args), \
+	(jintLong)FN(34, args), \
+	(jintLong)FN(35, args), \
+	(jintLong)FN(36, args), \
+	(jintLong)FN(37, args), \
+	(jintLong)FN(38, args), \
+	(jintLong)FN(39, args), \
+	(jintLong)FN(40, args), \
+	(jintLong)FN(41, args), \
+	(jintLong)FN(42, args), \
+	(jintLong)FN(43, args), \
+	(jintLong)FN(44, args), \
+	(jintLong)FN(45, args), \
+	(jintLong)FN(46, args), \
+	(jintLong)FN(47, args), \
+	(jintLong)FN(48, args), \
+	(jintLong)FN(49, args), \
+	(jintLong)FN(50, args), \
+	(jintLong)FN(51, args), \
+	(jintLong)FN(52, args), \
+	(jintLong)FN(53, args), \
+	(jintLong)FN(54, args), \
+	(jintLong)FN(55, args), \
+	(jintLong)FN(56, args), \
+	(jintLong)FN(57, args), \
+	(jintLong)FN(58, args), \
+	(jintLong)FN(59, args), \
+	(jintLong)FN(60, args), \
+	(jintLong)FN(61, args), \
+	(jintLong)FN(62, args), \
+	(jintLong)FN(63, args), \
+	(jintLong)FN(64, args), \
+	(jintLong)FN(65, args), \
+	(jintLong)FN(66, args), \
+	(jintLong)FN(67, args), \
+	(jintLong)FN(68, args), \
+	(jintLong)FN(69, args), \
+	(jintLong)FN(70, args), \
+	(jintLong)FN(71, args), \
+	(jintLong)FN(72, args), \
+	(jintLong)FN(73, args), \
+	(jintLong)FN(74, args), \
+	(jintLong)FN(75, args), \
+	(jintLong)FN(76, args), \
+	(jintLong)FN(77, args), \
+	(jintLong)FN(78, args), \
+	(jintLong)FN(79, args), \
+	(jintLong)FN(80, args), \
+	(jintLong)FN(81, args), \
+	(jintLong)FN(82, args), \
+	(jintLong)FN(83, args), \
+	(jintLong)FN(84, args), \
+	(jintLong)FN(85, args), \
+	(jintLong)FN(86, args), \
+	(jintLong)FN(87, args), \
+	(jintLong)FN(88, args), \
+	(jintLong)FN(89, args), \
+	(jintLong)FN(90, args), \
+	(jintLong)FN(91, args), \
+	(jintLong)FN(92, args), \
+	(jintLong)FN(93, args), \
+	(jintLong)FN(94, args), \
+	(jintLong)FN(95, args), \
+	(jintLong)FN(96, args), \
+	(jintLong)FN(97, args), \
+	(jintLong)FN(98, args), \
+	(jintLong)FN(99, args), \
+	(jintLong)FN(100, args), \
+	(jintLong)FN(101, args), \
+	(jintLong)FN(102, args), \
+	(jintLong)FN(103, args), \
+	(jintLong)FN(104, args), \
+	(jintLong)FN(105, args), \
+	(jintLong)FN(106, args), \
+	(jintLong)FN(107, args), \
+	(jintLong)FN(108, args), \
+	(jintLong)FN(109, args), \
+	(jintLong)FN(110, args), \
+	(jintLong)FN(111, args), \
+	(jintLong)FN(112, args), \
+	(jintLong)FN(113, args), \
+	(jintLong)FN(114, args), \
+	(jintLong)FN(115, args), \
+	(jintLong)FN(116, args), \
+	(jintLong)FN(117, args), \
+	(jintLong)FN(118, args), \
+	(jintLong)FN(119, args), \
+	(jintLong)FN(120, args), \
+	(jintLong)FN(121, args), \
+	(jintLong)FN(122, args), \
+	(jintLong)FN(123, args), \
+	(jintLong)FN(124, args), \
+	(jintLong)FN(125, args), \
+	(jintLong)FN(126, args), \
+	(jintLong)FN(127, args), \
 },
 #else
 #error Invalid MAX_CALLBACKS
 #endif /* MAX_CALLBACKS == 16 */
 
-SWT_PTR fnx_array[MAX_ARGS+1][MAX_CALLBACKS] = { 
+jintLong fnx_array[MAX_ARGS+1][MAX_CALLBACKS] = { 
 	FN_A_BLOCK(0)    
 	FN_A_BLOCK(1)    
 	FN_A_BLOCK(2)    
@@ -452,8 +452,8 @@ SWT_PTR fnx_array[MAX_ARGS+1][MAX_CALLBACKS] = {
 
 /* --------------- callback class calls --------------- */
 
-JNIEXPORT SWT_PTR JNICALL Java_org_eclipse_swt_internal_Callback_bind
-  (JNIEnv *env, jclass that, jobject callbackObject, jobject object, jstring method, jstring signature, jint argCount, jboolean isStatic, jboolean isArrayBased, SWT_PTR errorResult)
+JNIEXPORT jintLong JNICALL Java_org_eclipse_swt_internal_Callback_bind
+  (JNIEnv *env, jclass that, jobject callbackObject, jobject object, jstring method, jstring signature, jint argCount, jboolean isStatic, jboolean isArrayBased, jintLong errorResult)
 {
 	int i;
 	jmethodID mid = NULL;
@@ -487,7 +487,7 @@ JNIEXPORT SWT_PTR JNICALL Java_org_eclipse_swt_internal_Callback_bind
 			callbackData[i].errorResult = errorResult;
 			callbackData[i].methodID = mid;
 #ifndef USE_ASSEMBLER
-			return (SWT_PTR) fnx_array[argCount][i];
+			return (jintLong) fnx_array[argCount][i];
 #else
 			{
 			int j = 0, k, pad = 0;
@@ -512,7 +512,7 @@ JNIEXPORT SWT_PTR JNICALL Java_org_eclipse_swt_internal_Callback_bind
 
 #ifdef __APPLE__
 			/* darwin calling conventions require that the stack be aligned on a 16-byte boundary. */
-			k = (argCount+3)*sizeof(SWT_PTR);
+			k = (argCount+3)*sizeof(jintLong);
 			pad = ((k + 15) & ~15) - k;
 			if (pad > 0) {
 				//SUB ESP,pad - 3 bytes
@@ -523,7 +523,7 @@ JNIEXPORT SWT_PTR JNICALL Java_org_eclipse_swt_internal_Callback_bind
 #endif
 
 			// 3*argCount bytes
-			for (k=(argCount + 1) * sizeof(SWT_PTR); k >= sizeof(SWT_PTR)*2; k -= sizeof(SWT_PTR)) {
+			for (k=(argCount + 1) * sizeof(jintLong); k >= sizeof(jintLong)*2; k -= sizeof(jintLong)) {
 				//PUSH SS:[EBP+k]
 				code[j++] = 0xff;
 				code[j++] = 0x75;
@@ -543,31 +543,31 @@ JNIEXPORT SWT_PTR JNICALL Java_org_eclipse_swt_internal_Callback_bind
 				code[j++] = i;
 			}
 
-			//MOV EAX callback - 1 + sizeof(SWT_PTR) bytes
+			//MOV EAX callback - 1 + sizeof(jintLong) bytes
 			code[j++] = 0xb8;
-			((SWT_PTR *)&code[j])[0] = (SWT_PTR)&callback;
-			j += sizeof(SWT_PTR);
+			((jintLong *)&code[j])[0] = (jintLong)&callback;
+			j += sizeof(jintLong);
 
 			//CALL EAX - 2 bytes
 			code[j++] = 0xff;
 			code[j++] = 0xd0;
 
-			//ADD ESP,(argCount + 1) * sizeof(SWT_PTR) - 3 bytes
+			//ADD ESP,(argCount + 1) * sizeof(jintLong) - 3 bytes
 			code[j++] = 0x83;
 			code[j++] = 0xc4;
 #ifdef __APPLE__
-			code[j++] = (unsigned char)(pad + ((argCount + 1) * sizeof(SWT_PTR)));
+			code[j++] = (unsigned char)(pad + ((argCount + 1) * sizeof(jintLong)));
 #else
-			code[j++] = (unsigned char)((argCount + 1) * sizeof(SWT_PTR));
+			code[j++] = (unsigned char)((argCount + 1) * sizeof(jintLong));
 #endif
 
 			//POP EBP - 1 byte
 			code[j++] = 0x5d;
 
 #if defined (_WIN32) || defined (_WIN32_WCE)
-			//RETN argCount * sizeof(SWT_PTR) - 3 bytes
+			//RETN argCount * sizeof(jintLong) - 3 bytes
 			code[j++] = 0xc2;
-			code[j++] = (unsigned char)(argCount * sizeof(SWT_PTR));
+			code[j++] = (unsigned char)(argCount * sizeof(jintLong));
 			code[j++] = 0x00;
 #else
 			//RETN - 1 byte
@@ -579,7 +579,7 @@ JNIEXPORT SWT_PTR JNICALL Java_org_eclipse_swt_internal_Callback_bind
 				(*env)->ThrowNew(env, errorClass, "Callback thunk overflow");
 			}
 
-			return (SWT_PTR)code;
+			return (jintLong)code;
 			}
 #endif /* USE_ASSEMBLER */
 		}
@@ -625,7 +625,7 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_Callback_reset
     memset((void *)&callbackData, 0, sizeof(callbackData));
 }
 
-SWT_PTR callback(int index, ...)
+jintLong callback(int index, ...)
 {
 	if (!callbackEnabled) return 0;
 
@@ -636,7 +636,7 @@ SWT_PTR callback(int index, ...)
 	jboolean isStatic = callbackData[index].isStatic;
 	jboolean isArrayBased = callbackData[index].isArrayBased;
 	jint argCount = callbackData[index].argCount;
-	SWT_PTR result = callbackData[index].errorResult;
+	jintLong result = callbackData[index].errorResult;
 	int detach = 0;
 	va_list vl;
 
@@ -673,18 +673,18 @@ SWT_PTR callback(int index, ...)
 	va_start(vl, index);
 	if (isArrayBased) {
 		int i;
-		SWT_PTRArray argsArray = (*env)->NewSWT_PTRArray(env, argCount);
+		jintLongArray argsArray = (*env)->NewIntLongArray(env, argCount);
 		if (argsArray != NULL) {
-			SWT_PTR *elements = (*env)->GetSWT_PTRArrayElements(env, argsArray, NULL);
+			jintLong *elements = (*env)->GetIntLongArrayElements(env, argsArray, NULL);
 			if (elements != NULL) {
 				for (i=0; i<argCount; i++) {
-					elements[i] = va_arg(vl, SWT_PTR); 
+					elements[i] = va_arg(vl, jintLong); 
 				}
-				(*env)->ReleaseSWT_PTRArrayElements(env, argsArray, elements, 0);
+				(*env)->ReleaseIntLongArrayElements(env, argsArray, elements, 0);
 				if (isStatic) {
-					result = (*env)->CallStaticSWT_PTRMethod(env, object, mid, argsArray);
+					result = (*env)->CallStaticIntLongMethod(env, object, mid, argsArray);
 				} else {
-					result = (*env)->CallSWT_PTRMethod(env, object, mid, argsArray);
+					result = (*env)->CallIntLongMethod(env, object, mid, argsArray);
 				}
 			}
 			/*
@@ -695,9 +695,9 @@ SWT_PTR callback(int index, ...)
 		}
 	} else {
 		if (isStatic) {
-			result = (*env)->CallStaticSWT_PTRMethodV(env, object, mid, vl);
+			result = (*env)->CallStaticIntLongMethodV(env, object, mid, vl);
 		} else {
-			result = (*env)->CallSWT_PTRMethodV(env, object, mid, vl);
+			result = (*env)->CallIntLongMethodV(env, object, mid, vl);
 		}
 	}
 	va_end(vl);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h
index 39152aef13..b67b8dd151 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h
@@ -24,7 +24,7 @@
 #endif
 
 #ifndef RETURN_TYPE
-#define RETURN_TYPE SWT_PTR
+#define RETURN_TYPE jintLong
 #endif
 
 #ifndef RETURN_CAST
@@ -57,7 +57,7 @@ typedef struct CALLBACK_DATA {
 	jboolean isStatic;
 	jboolean isArrayBased; 
 	jint argCount;
-	SWT_PTR errorResult;
+	jintLong errorResult;
 } CALLBACK_DATA;
 
 #endif /* ifndef INC_callback_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h b/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h
index 219b1ad5f1..35e2e761c6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h
@@ -28,42 +28,72 @@ extern "C" {
 
 extern int IS_JNI_1_2;
 
-#ifndef SWT_PTR_SIZE_64
+#ifndef JNI64
 #if __x86_64__
-#define SWT_PTR_SIZE_64
+#define JNI64
 #endif
 #endif
 
 /* 64 bit support */
-#ifndef SWT_PTR_SIZE_64
-
-#define GetSWT_PTRField GetIntField
-#define SetSWT_PTRField SetIntField
-#define NewSWT_PTRArray NewIntArray
-#define CallStaticSWT_PTRMethodV CallStaticIntMethodV
-#define CallSWT_PTRMethodV CallIntMethodV
-#define CallStaticSWT_PTRMethod CallStaticIntMethod
-#define CallSWT_PTRMethod CallIntMethod
-#define GetSWT_PTRArrayElements GetIntArrayElements
-#define ReleaseSWT_PTRArrayElements ReleaseIntArrayElements
-#define SWT_PTRArray jintArray
-#define SWT_PTR jint
-#define SWT_PTR_SIGNATURE "I"
+#ifndef JNI64
+
+/* int/long defines */
+#define GetIntLongField GetIntField
+#define SetIntLongField SetIntField
+#define GetIntLongArrayElements GetIntArrayElements
+#define ReleaseIntLongArrayElements ReleaseIntArrayElements
+#define GetIntLongArrayRegion GetIntArrayRegion
+#define SetIntLongArrayRegion SetIntArrayRegion
+#define NewIntLongArray NewIntArray
+#define CallStaticIntLongMethod CallStaticIntMethod
+#define CallIntLongMethod CallIntMethod
+#define CallStaticIntLongMethodV CallStaticIntMethodV
+#define CallIntLongMethodV CallIntMethodV
+#define jintLongArray jintArray
+#define jintLong jint
+#define I_J "I"
+#define I_JArray "[I"
+
+/* float/double defines */
+#define GetFloatDoubleField GetFloatField
+#define SetFloatDoubleField SetFloatField
+#define GetFloatDoubleArrayElements GetFloatArrayElements
+#define ReleaseFloatDoubleArrayElements ReleaseFloatArrayElements
+#define GetFloatDoubleArrayRegion GetFloatArrayRegion
+#define jfloatDoubleArray jfloatArray
+#define jfloatDouble jfloat
+#define F_D "F"
+#define F_DArray "[F"
 
 #else
 
-#define GetSWT_PTRField GetLongField
-#define SetSWT_PTRField SetLongField
-#define NewSWT_PTRArray NewLongArray
-#define CallStaticSWT_PTRMethodV CallStaticLongMethodV
-#define CallSWT_PTRMethodV CallLongMethodV
-#define CallStaticSWT_PTRMethod CallStaticLongMethod
-#define CallSWT_PTRMethod CallLongMethod
-#define GetSWT_PTRArrayElements GetLongArrayElements
-#define ReleaseSWT_PTRArrayElements ReleaseLongArrayElements
-#define SWT_PTRArray jlongArray
-#define SWT_PTR jlong
-#define SWT_PTR_SIGNATURE "J"
+/* int/long defines */
+#define GetIntLongField GetLongField
+#define SetIntLongField SetLongField
+#define GetIntLongArrayElements GetLongArrayElements
+#define ReleaseIntLongArrayElements ReleaseLongArrayElements
+#define GetIntLongArrayRegion GetLongArrayRegion
+#define SetIntLongArrayRegion SetLongArrayRegion
+#define NewIntLongArray NewLongArray
+#define CallStaticIntLongMethod CallStaticLongMethod
+#define CallIntLongMethod CallLongMethod
+#define CallStaticIntLongMethodV CallStaticLongMethodV
+#define CallIntLongMethodV CallLongMethodV
+#define jintLongArray jlongArray
+#define jintLong jlong
+#define I_J "J"
+#define I_JArray "[J"
+
+/* float/double defines */
+#define GetFloatDoubleField GetDoubleField
+#define SetFloatDoubleField SetDoubleField
+#define GetFloatDoubleArrayElements GetDoubleArrayElements
+#define ReleaseFloatDoubleArrayElements ReleaseDoubleArrayElements
+#define GetFloatDoubleArrayRegion GetDoubleArrayRegion
+#define jfloatDoubleArray jdoubleArray
+#define jfloatDouble jdouble
+#define F_D "D"
+#define F_DArray "[D"
 
 #endif
 
@@ -81,7 +111,7 @@ extern int IS_JNI_1_2;
 #define CALLING_CONVENTION CALLBACK
 #define LOAD_FUNCTION(var, name) \
 		static int initialized = 0; \
-		static void *var = NULL; \
+		static FARPROC var = NULL; \
 		if (!initialized) { \
 			HMODULE hm = LoadLibrary(name##_LIB); \
 			if (hm) var = GetProcAddress(hm, #name); \